From aa0ff7b4e699bb6b8ac0551312d389a56c92125e Mon Sep 17 00:00:00 2001 From: tbrittoborges Date: Tue, 31 Mar 2015 15:10:28 +0100 Subject: [PATCH] small things --- css/gridder.css | 114 +++++++ css/style.css | 38 +-- gridder.html | 191 +++++++++++ img/active.png | 694 +++++++++++++++++++++++++++++++++++++++ img/close.png | 694 +++++++++++++++++++++++++++++++++++++++ img/next.png | 694 +++++++++++++++++++++++++++++++++++++++ img/prev.png | 673 +++++++++++++++++++++++++++++++++++++ index.html | 97 +++--- js/custom.js | 5 +- js/jquery.gridder.min.js | 10 +- 10 files changed, 3117 insertions(+), 93 deletions(-) create mode 100644 css/gridder.css create mode 100644 gridder.html create mode 100644 img/active.png create mode 100644 img/close.png create mode 100644 img/next.png create mode 100644 img/prev.png diff --git a/css/gridder.css b/css/gridder.css new file mode 100644 index 0000000..0914917 --- /dev/null +++ b/css/gridder.css @@ -0,0 +1,114 @@ +/* MIXINS */ +.gridder.hasSelectedItem .gridder-list { + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); + opacity: 0.5; +} + +.gridder.hasSelectedItem .gridder-list.selectedItem { + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100); + opacity: 100; +} + +.gridder-list { + float: none; + display: inline-block; + width: 150px; + vertical-align: top; + margin: 0px; +} + +.gridder-list .gridder-thumb { + cursor: pointer; +} + +.gridder-list .title { + display: block; + /*font-weight: bold;*/ + color: #FFF; + /*font-size: 14px;*/ + justify-content: center; +} + +.gridder-list .description { + color: red; + min-height: 30px; +} + +.gridder-list .image { + background: #242424 url("../images/loading-spin.svg") no-repeat center; + height: 273px; +} + +@media only screen and (max-width: 768px) { + + .gridder-list { + width: 48%; + } + + .gridder-list .image { + height: auto; + } +} + +@media only screen and (max-width: 768px) { + + .gridder-list { + width: 48%; + } + + .gridder-list .image { + height: auto; + } +} + +@media only screen and (max-width: 768px) { + .gridder-show { + padding: 15px; + } +} + +.gridder-show { + padding: 50px; + margin-bottom: 20px; + background: white; + -webkit-box-shadow: inset 0px 0px 20px 5px rgba(0, 0, 0, 0.16); + -moz-box-shadow: inset 0px 0px 20px 5px rgba(0, 0, 0, 0.16); + box-shadow: inset 0px 0px 20px 5px rgba(0, 0, 0, 0.16); +} + +.gridder-navigation { + position: absolute; + right: 50px; + top: 25px; +} + +.gridder-navigation a { + color: #FFF; + display: inline-block; + background: #4A4A4A; + border-radius: 5px; + margin-left: 5px; + padding: 5px; + font-size: 12px; + text-transform: uppercase; +} + +.gridder-navigation a:hover { + text-decoration: none; + background: #CCC; +} + +@media only screen and (max-width: 768px) and (max-width: 1200px) { + .gridder-navigation { + position: relative; + right: auto; + top: auto; + margin-bottom: 15px; + } +} + +.gridder-expanded-content { + color: #000000; +} + +/*font-family: 'Arial', sans-serif; font-size: 14px; line-height: 150%; color: red; }*/ \ No newline at end of file diff --git a/css/style.css b/css/style.css index 5f26875..f700dd3 100755 --- a/css/style.css +++ b/css/style.css @@ -582,28 +582,6 @@ body { padding-bottom: 10%; } -#team .thumbnail { - width: 70%; - background-color: transparent; - border-color: transparent; -} - -#team .caption { - color: slategrey; -} - -#team .thumbnail:focus, -#team .thumbnail:hover { - border: 1px solid #DA291C; - outline: 0; - cursor: pointer !important; -} - -#team .thumbnail:focus, -#team .thumbnail:hover > .caption { - color: #DA291C; -} - .popover { color: #000000; width: 100%; @@ -627,6 +605,8 @@ div.window { text-align: center; margin: 0 auto; max-width: 85%; + padding-bottom: 10%; + /*background-color: red;*/ } @@ -643,6 +623,10 @@ div.window label:hover { cursor: pointer; } +#speakers img { + padding-bottom: inherit; +} + /*#sue + #mathias + #tim + */ #speakers label:after { content: "Bio" @@ -652,27 +636,27 @@ div.window label:hover { content: "Close" } - -input.toggle ~ div { +#speakers input.toggle ~ div { height: 0; overflow: hidden; /*transition: .6s all cubic-bezier(0.730, -0.485, 0.145, 1.620)*/ } -input.toggle:checked ~ div { +#speakers input.toggle:checked ~ div { height: auto; /*background-color: white;*/ /*color: #000000;*/ } -input.toggle:checked + label { +#speakers input.toggle:checked + label { background: darkgrey; content: "Close" } -input.toggle { +#speakers input.toggle { display: none; } + diff --git a/gridder.html b/gridder.html new file mode 100644 index 0000000..fa3d579 --- /dev/null +++ b/gridder.html @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + +
Dianbo Liu is the licence holder for the +upcoming TEDxUniversityofDundee event. He is the leader + of the team and is currently studying for a PhD within the + Computational and Physical Biology department at the + University of Dundee. He is interested in making links + among seemingly unrelated fields, and therefore come up + with innovative and useful inventions.
+
Gillian Dunphy was born and raised in Glasgow but was + compelled to make the lengthy journey to Dundee after being + lured by its East Coast charm. She is currently studying for + a PhD in Immunology at the University of Dundee. She is + currently managing a team of student volunteers in the areas + of Graphic Design and Stage Design. She is also involved in + marketing and speaker recruitment.
+
Stefan Tomov is a recent University of Dundee + graduate in the field of Economics and Politics. He comes + from Bulgaria and is currently the Deputy President of + Dundee University Students' Association (DUSA). Stefan is + responsible for securing the logistics required to make + TEDxUniversityofDundee a resounding success.
+
Thiago Britto-Borges is a Brazilian PhD student within + the Computational Biology department of the University of Dundee + He has an inexhaustible passion for learning and enjoys spreading knowledge. Thiago + is responsible for developing and designing the TEDxUniversityofDundee website.
+
Sarah-Lena Offenburger is pursuing a PhD in + Neurobiology at the University of Dundee. When Sarah is not + in the lab, you will probably find her doing sports, taking + pictures or just having a coffee with friends. Sarah is a + curator within our team and is responsible for recruiting + and liasing with the speakers of the event.
+
Originally from Portugal, Fábio Madeira is + currently studying for a PhD within the Cell and Molecular + Biology department at the University of Dundee, + specialising in Computational Biology. Alongside with Thiago, he helps managing and developing the website of the event.
+
is the president of Enterprise + Gym which is a University of Dundee department where + students learn about entrepreneurship. She comes from the + small and pretty town of Liepaya, which is located on the + Latvian coast of the Baltic Sea. Darya is responsible for + the recruitment of volunteers and organising the logistics + of the event.
+
moved from the island of + Mauritius to equally sunny Dundee to pursue a PhD in + Microbiology. His role in the team is to co-ordinate the + overall organisation of the TEDx event and to ensure that + progress is being made.
+
is currently studying Computer Science at the University of Dundee. + He is in his third year now and interested in Web + Programming, Product Development and Entrepreneurship. Sam + is our Social Media Officer, taking care of our Twitter and + Facebook accounts.
+
is the Enterprise Assistant & Coordinator + at the Enterprise Gym, University of Dundee. + Her perseverance and passion for entrepreneurship and innovation has seen her work her way up in the roles in the department. + She received her BSc in business Economics with marketing from Dundee University in 2014. Dora is actively contributing her + expertise in a number of areas of the project.
+
is Head of Enterprise & + Entrepreneurial Strategy at the University of Dundee. + Not a man to sit about, Alasdair has a brain that's always + busy and he loves thinking of creative ways to make a + difference. As well as his role at the university, Alasdair + is also a director and founder of several companies in + industries as diverse as retail, software, sports and + financial services. He is a formidable adviser within our + team.
+
is currently pursuing a master's + degree in Data Engineering. He studies Data because he likes + to observe and find patterns in the environment that + surrounds us. Yuri serves as a curator along with Sarah in + our team. He is involved in the recruitment of speakers.
+ + + + + \ No newline at end of file diff --git a/img/active.png b/img/active.png new file mode 100644 index 0000000..b20ea83 --- /dev/null +++ b/img/active.png @@ -0,0 +1,694 @@ + + + + + + + + + + + + gridder/active.png at master · oriongunning/gridder + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + + + +
+
+
+ +
+
+
+ +
    + +
  • +
    + +
    + + + + + Watch + + + +
    + +
    +
    +
    + +
  • + +
  • + +
    + +
    + + +
    +
    + + +
    + +
  • + +
  • + + + Fork + + +
  • + +
+ +

+ + /gridder + + + + + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

SSH clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +

You can clone with + HTTPS, SSH, or Subversion. + + + +

+ + + + Clone in Desktop + + + + + + Download ZIP + +
+
+ +
+ + + + + + +
+ +
+ + + branch: + master + + + +
+ +
+ + + + +
+ + +
+ + +
+
+ oriongunning + + + +
+ + + +
+ +
+
+
+
+ Raw + History +
+ + + + + + +
+ +
+
+
+ 1.002 kb +
+
+ +
+
+ active.png +
+
+ +
+ +Jump to Line + + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+ +
+ + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + + diff --git a/img/close.png b/img/close.png new file mode 100644 index 0000000..e499282 --- /dev/null +++ b/img/close.png @@ -0,0 +1,694 @@ + + + + + + + + + + + + gridder/close.png at master · oriongunning/gridder + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + + + +
+
+
+ +
+
+
+ +
    + +
  • +
    + +
    + + + + + Watch + + + +
    + +
    +
    +
    + +
  • + +
  • + +
    + +
    + + +
    +
    + + +
    + +
  • + +
  • + + + Fork + + +
  • + +
+ +

+ + /gridder + + + + + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

SSH clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +

You can clone with + HTTPS, SSH, or Subversion. + + + +

+ + + + Clone in Desktop + + + + + + Download ZIP + +
+
+ +
+ + + + + + +
+ +
+ + + branch: + master + + + +
+ +
+ + + + +
+ + +
+ + +
+
+ splashbox + splashbox + + +
+ + + +
+ +
+
+
+
+ Raw + History +
+ + + + + + +
+ +
+
+
+ 1.047 kb +
+
+ +
+
+ close.png +
+
+ +
+ +Jump to Line + + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+ +
+ + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + + diff --git a/img/next.png b/img/next.png new file mode 100644 index 0000000..5b746ae --- /dev/null +++ b/img/next.png @@ -0,0 +1,694 @@ + + + + + + + + + + + + gridder/next.png at master · oriongunning/gridder + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + + + +
+
+
+ +
+
+
+ +
    + +
  • +
    + +
    + + + + + Watch + + + +
    + +
    +
    +
    + +
  • + +
  • + +
    + +
    + + +
    +
    + + +
    + +
  • + +
  • + + + Fork + + +
  • + +
+ +

+ + /gridder + + + + + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

SSH clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +

You can clone with + HTTPS, SSH, or Subversion. + + + +

+ + + + Clone in Desktop + + + + + + Download ZIP + +
+
+ +
+ + + + + + +
+ +
+ + + branch: + master + + + +
+ +
+ + + + +
+ + +
+ + +
+
+ splashbox + splashbox + + +
+ + + +
+ +
+
+
+
+ Raw + History +
+ + + + + + +
+ +
+
+
+ 1.435 kb +
+
+ +
+
+ next.png +
+
+ +
+ +Jump to Line + + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+ +
+ + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + + diff --git a/img/prev.png b/img/prev.png new file mode 100644 index 0000000..47d8394 --- /dev/null +++ b/img/prev.png @@ -0,0 +1,673 @@ + + + + + + + + + + + + gridder/prev.png at master · oriongunning/gridder + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + + + +
+
+
+ +
+
+
+ +
    + +
  • +
    + +
    + + + + + Watch + + + +
    + +
    +
    +
    + +
  • + +
  • + +
    + +
    + + +
    +
    + + +
    + +
  • + +
  • + + + Fork + + +
  • + +
+ +

+ + /gridder + + + + + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

SSH clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +

You can clone with + HTTPS, SSH, or Subversion. + + + +

+ + + + Clone in Desktop + + + + + + Download ZIP + +
+
+ +
+ + + + + + +
+ +
+ + + branch: + master + + + +
+ +
+ + + + +
+ + +
+ + +
+ Fetching contributors… +
+ +
+

+

Cannot retrieve contributors at this time

+
+
+
+
+
+
+ Raw + History +
+ + + + + + +
+ +
+
+
+ 1.449 kb +
+
+ +
+
+ prev.png +
+
+ +
+ +Jump to Line + + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+ +
+ + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + + diff --git a/index.html b/index.html index f153fb7..29bf4a3 100755 --- a/index.html +++ b/index.html @@ -210,14 +210,15 @@

TEDx University of Dundee

Confirmed Speakers

- -
- +
+ Sue photo -

-

- Professor Sue Black + class='img-responsive img-rounded'> +

+
+ +

Professor Sue Black , Director of the Centre for Anatomy and Human Identification at University of Dundee.

@@ -244,34 +245,34 @@

Confirmed Speakers

Anniversary Prize for Higher and Further Education. Her research was shortlisted for the Times Higher Education research project of the year. - -

How would you like to make a difference at - TEDxUniversityOfDundee?

- +

How would you like to make a difference?

I would like people to think about who they really are.

+
- -



-
- Image -

-

Professor Matthias Klaes, - Dean of the School of Business at University of Dundee. -

- - -

More information to be added soon.

-
-



-
- +
+ Mathias photo +
+
+

Professor Matthias Klaes, + Dean of the School of Business at University of Dundee. +

+ + +

More information to be added soon.

+
+
+
+
+ Tim photo -

+ class='img-responsive img-rounded'> +
+

Professor Tim Newman, Professor of Biophysics and Dean of Engineering, Physics and Mathematics at the University of Dundee.

@@ -293,22 +294,22 @@

How would you like to make a difference at and boards in the US and the UK and continually strives to nurture interdisciplinary research and education at the interface between the physical sciences and the life sciences.

-

How would you like to make a difference at - TEDxUniversityOfDundee?

+

How would you like to make a difference?

Great ideas, an open mind, working with young people, and no sacred cows.

-



-
- +
+
+ Emanuele photo -

-

- Professor Emanuele Trucco - ,"NRP Chair of Computational Vision and VAMPIRE project director". + class='img-responsive img-rounded'> +

+
+

Professor Emanuele Trucco + , NRP Chair of Computational Vision and VAMPIRE project director.

@@ -341,8 +342,7 @@

How would you like to make a difference at Genova, Italy) has become an international standard (2,516 citations, Google Scholar March 2014).

-

How would you like to make a difference at - TEDxUniversityOfDundee?

+

How would you like to make a difference ?

I firmly believe that research has at least two key dimensions. One is the technical challenge of advancing knowledge; @@ -359,13 +359,11 @@

How would you like to make a difference at share, laugh and flourish as scientists and as persons. I hope to be able to put across this message as inspiringly as possible!

+

- -
-
@@ -378,7 +376,7 @@

Organizing Team

- Dianbo Liu + Dianbo Liu
  • @@ -795,7 +793,6 @@

    Disclaimer

    var marker = new google.maps.Marker({ position: myCenter }); - marker.setMap(map); } google.maps.event.addDomListener(window, 'load', initialize); @@ -803,7 +800,6 @@

    Disclaimer

    - - - - - \ No newline at end of file diff --git a/js/custom.js b/js/custom.js index 7d8c6a2..7564860 100755 --- a/js/custom.js +++ b/js/custom.js @@ -18,7 +18,4 @@ $(function() { }); }); -// Closes the Responsive Menu on Menu Item Click -$('.navbar-collapse ul li a').click(function() { - $('.navbar-toggle:visible').click(); -}); + diff --git a/js/jquery.gridder.min.js b/js/jquery.gridder.min.js index c71f744..d41c382 100644 --- a/js/jquery.gridder.min.js +++ b/js/jquery.gridder.min.js @@ -1,9 +1 @@ -/* - * Gridder - v1.3.0 - * A jQuery plugin that displays a thumbnail grid expanding preview similar to the effect seen on Google Images. - * http://www.oriongunning.com/ - * - * Made by Orion Gunning - * Under MIT License - */ -!function(a){a.fn.extend(a.easing,{def:"easeInOutExpo",easeInOutExpo:function(a,b,c,d,e){return 0===b?c:b===e?c+d:(b/=e/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--b)+2)+c}}),a.fn.gridderExpander=function(b){var c=a.extend({},a.fn.gridderExpander.defaults,b);return this.each(function(){function b(b,c){c.scroll&&a("html, body").animate({scrollTop:b.find(".selectedItem").offset().top-c.scrollOffset},{duration:200,easing:c.animationEasing}),e.removeClass("hasSelectedItem"),f=!1,b.find(".selectedItem").removeClass("selectedItem"),b.find(".gridder-show").slideUp(c.animationSpeed,c.animationEasing,function(){b.find(".gridder-show").remove(),c.onClosed(b)})}var d,e=a(this),f=!1;c.onStart(e),e.find(".gridder-list").on("click",function(g){g.stopPropagation();var h=a(this);if(h.hasClass("selectedItem"))return void b(e,c);if(e.find(".selectedItem").removeClass("selectedItem"),h.addClass("selectedItem"),e.find(".gridder-show").remove(),c.scroll){var i="panel"===c.scrollTo?h.offset().top+h.height()-c.scrollOffset:h.offset().top-c.scrollOffset;a("html, body").animate({scrollTop:i},{duration:c.animationSpeed,easing:c.animationEasing})}e.hasClass("hasSelectedItem")||e.addClass("hasSelectedItem");var j=a('
    ');d=j.insertAfter(h);var k=a(h.data("griddercontent")).html(),l='
    ';l+='
    ',l+='Close',l+='',l+='',l+="
    ",l+='
    ',l+=k,l+="
    ",l+="
    ",d.html(l),f?d.find(".gridder-padding").fadeIn(c.animationSpeed,c.animationEasing,function(){f=!0,a.isFunction(c.onContent)&&c.onContent(d)}):d.find(".gridder-padding").slideDown(c.animationSpeed,c.animationEasing,function(){f=!0,a.isFunction(c.onContent)&&c.onContent(d)})}),e.on("click",".gridder-nav.next",function(b){b.preventDefault(),a(this).parents(".gridder-show").next().trigger("click")}),e.on("click",".gridder-nav.prev",function(b){b.preventDefault(),a(this).parents(".gridder-show").prev().prev().trigger("click")}),e.on("click",".gridder-close",function(a){a.preventDefault(),b(e,c)})})},a.fn.gridderExpander.defaults={scroll:!0,scrollOffset:30,scrollTo:"panel",animationSpeed:400,animationEasing:"easeInOutExpo",onStart:function(){console.log("Gridder Inititialized")},onContent:function(){console.log("Gridder Content Loaded")},onClosed:function(){console.log("Gridder Closed")}}}(jQuery); \ No newline at end of file +!function(b){b.fn.extend(b.easing,{def:"easeInOutExpo",easeInOutExpo:function(g,f,j,i,h){return 0===f?j:f===h?j+i:(f/=h/2)<1?i/2*Math.pow(2,10*(f-1))+j:i/2*(-Math.pow(2,-10*--f)+2)+j}}),b.fn.gridderExpander=function(a){var d=b.extend({},b.fn.gridderExpander.defaults,a);return this.each(function(){function c(e,f){f.scroll&&b("html, body").animate({scrollTop:e.find(".selectedItem").offset().top-f.scrollOffset},{duration:200,easing:f.animationEasing}),h.removeClass("hasSelectedItem"),g=!1,e.find(".selectedItem").removeClass("selectedItem"),e.find(".gridder-show").slideUp(f.animationSpeed,f.animationEasing,function(){e.find(".gridder-show").remove(),f.onClosed(e)})}var i,h=b(this),g=!1;d.onStart(h),h.find(".gridder-list").on("click",function(p){p.stopPropagation();var o=b(this);if(o.hasClass("selectedItem")){return void c(h,d)}if(h.find(".selectedItem").removeClass("selectedItem"),o.addClass("selectedItem"),h.find(".gridder-show").remove(),d.scroll){var n="panel"===d.scrollTo?o.offset().top-d.scrollOffset:o.offset().top-d.scrollOffset;b("html, body").animate({scrollTop:n},{duration:d.animationSpeed,easing:d.animationEasing})}h.hasClass("hasSelectedItem")||h.addClass("hasSelectedItem");var m=b('
    ');i=m.insertAfter(o);var f=b(o.data("griddercontent")).html(),e='
    ';e+='
    ',e+='Close',e+='',e+='',e+="
    ",e+='
    ',e+=f,e+="
    ",e+="
    ",i.html(e),g?i.find(".gridder-padding").fadeIn(d.animationSpeed,d.animationEasing,function(){g=!0,b.isFunction(d.onContent)&&d.onContent(i)}):i.find(".gridder-padding").slideDown(d.animationSpeed,d.animationEasing,function(){g=!0,b.isFunction(d.onContent)&&d.onContent(i)})}),h.on("click",".gridder-nav.next",function(e){e.preventDefault(),b(this).parents(".gridder-show").next().trigger("click")}),h.on("click",".gridder-nav.prev",function(e){e.preventDefault(),b(this).parents(".gridder-show").prev().prev().trigger("click")}),h.on("click",".gridder-close",function(e){e.preventDefault(),c(h,d)})})},b.fn.gridderExpander.defaults={scroll:!1,scrollOffset:30,scrollTo:"panel",animationSpeed:400,animationEasing:"easeInOutExpo",onStart:function(){console.log("Gridder Inititialized")},onContent:function(){console.log("Gridder Content Loaded")},onClosed:function(){console.log("Gridder Closed")}}}(jQuery); \ No newline at end of file