commit du 11 10 2013 16:01

diff --git a/css/style-1000px.css b/css/style-1000px.css
index 8b4a6dd3092bbcd3bce75de8e10ccd7db605ae00..3530e903b3c197fa85ccd4f11d2a26a395e4254f 100644 (file)
--- a/css/style-1000px.css
+++ b/css/style-1000px.css
@@ -77,14 +77,12 @@
        #logo
        {
                z-index:12000;
-               position:fixed;
-               float:left;
-               margin-top: 0.6em;
                height: 64px;
                width: 220px;
-               margin-left:15px;
-               margin-right:0px;
-               padding: 2.5px 0px 0px 0px;
+               position:relative;
+               margin:auto;
+               right:387px;
+               padding: 12px 0px 0px 0px;
        }
        
 
@@ -119,9 +117,8 @@
        {
                position:fixed;
                z-index: 11000;
-               padding-left:140px;
                top: 0px;
-               left:0px;
+               left:70px;
                width: 100%;
                height:55px;
                text-align: center;

diff --git a/css/style-desktop.css b/css/style-desktop.css
index 11f9ccc6d4e7126a2e4c09c04ec80231559d31c0..781b850a1b63b49e80ed201f91d860b45cac65bb 100644 (file)
--- a/css/style-desktop.css
+++ b/css/style-desktop.css
@@ -362,14 +362,13 @@
 
        #logo
        {
-               position:fixed;
+               position:relative;
                z-index: 12000;
-               float:left;
                height: 85px;
                width: 295px;
-               margin-left:210px;
-               margin-right:0px;
-               padding: 2.5px 0px 0px 0px;
+               margin:auto;
+               right:475px;
+               padding: 3px 0px 0px 0px;
        }
        
 
@@ -410,11 +409,10 @@
        {       
                position:fixed;
                z-index: 11000;
-               padding-left:130px;
                top: 0px;
-               left:0px;
                width: 100%;
                height:60px;
+               left:70px;
                text-align: center;
                vertical-align:top;
        }

diff --git a/css/style.css b/css/style.css
index bf2e2f6934cc881a37ea00fce64a9d221fbe223f..d29f1f5d5b34f6b719e8a41b8d8d88b7a12a1ea8 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -748,27 +748,188 @@
                }
                
 /*********************************************************************************/
-/* Menu                                                                          */
+/* Logo                                                                          */
 /*********************************************************************************/
-       #nav-back
+
+       #logo
        {
+
        }
        
-       
-       #nav
+
+               
+               
+               #logo img
        {
+
+
        }
 
-       #logo
+               #logo h1
+               {
+
+               }
+               
+               #logo .byline
+               {
+               }
+
+/*********************************************************************************/
+/* Nav                                                                           */
+/*********************************************************************************/
+               #nav-back
        {
+
        }
+
        
-               #logo h1
+       #nav
+       {       
+
+       }
+
+               #nav > ul > li > ul
                {
+                       display: none;
+                       
+               }
+
+               #nav > ul
+               {
+                       display: inline-block;
+                       /*border-radius: 0.35em;
+                       box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25);*/
+                       padding: 0em 0em 0em 0em;
                }
+
+               #nav > ul > li
+               {
+                       display: inline-block;
+                       text-align: center;
+                       padding: 0em 0.10em 0em 0.10em;
+               }
+               
+               
+               #nav > ul > li > span
+                       {
+                               font-family: 'ralewayextrabold', sans-serif;
+                               display: block;
+                               color: #eee;
+                               color: rgba(255,255,255,0.75);
+                               text-transform: uppercase;
+                               text-decoration: none;
+                               font-size: 0.75em;
+                               letter-spacing: 0.02em;
+                               height: 5em;
+                               line-height: 5em;
+                               -moz-transition: all .25s ease-in-out;
+                               -webkit-transition: all .25s ease-in-out;
+                               -o-transition: all .25s ease-in-out;
+                               -ms-transition: all .25s ease-in-out;
+                               transition: all .25s ease-in-out;
+                               outline: 0;
+                       }
                
+                       #nav > ul > li > a
+                       {
+                               font-family: 'ralewayextrabold', sans-serif;
+                               display: block;
+                               color: #eee;
+                               color: rgba(255,255,255,0.75);
+                               text-transform: uppercase;
+                               text-decoration: none;
+                               font-size: 0.75em;
+                               letter-spacing: 0.02em;
+                               height: 5em;
+                               line-height: 5em;
+                               -moz-transition: all .25s ease-in-out;
+                               -webkit-transition: all .25s ease-in-out;
+                               -o-transition: all .25s ease-in-out;
+                               -ms-transition: all .25s ease-in-out;
+                               transition: all .25s ease-in-out;
+                               outline: 0;
+                               top:0;
+                       }
+                       
+                       #nav > ul > li:hover > a,
+                       #nav > ul > li.active > a,                      
+                       #nav > ul > li:hover >span,
+                       {
+                               color: #fff;
+                       }
+
+       .dropotron
+       {
+               margin-left:-0.5em;
+               background: #222835 url('images/overlay.png');
+               background-color: rgba(24,23,30,0.925);
+               padding: 0.5em 0.5em 0.5em 0.5em;
+               border-radius: 0.35em;
+               box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25);
+               min-width: 10em;
+               text-align: left;
+
+       }
        
+               .dropotron-level-0
+               {
+                       
+                       margin-top:-5px;
+                       border-top-left-radius: 0;
+                       border-top-right-radius: 0;
+               }
+               .dropotron span
+               {
+                       font-family: 'ralewayextrabold', sans-serif;
+                       display: block;
+                       color: #eee;
+                       color: rgba(255,255,255,0.75);
+                       text-transform: uppercase;
+                       text-decoration: none;
+                       font-size: 0.75em;
+                       letter-spacing: 0.1em;
+                       border-top: solid 1px rgba(255,255,255,0.15);
+                       line-height: 3em;
+                       -moz-transition: all .25s ease-in-out;
+                       -webkit-transition: all .25s ease-in-out;
+                       -o-transition: all .25s ease-in-out;
+                       -ms-transition: all .25s ease-in-out;
+                       transition: all .25s ease-in-out;
+               }
+               
+               .dropotron a
+               {
+                       font-family: 'ralewaymedium', sans-serif;
+                       display: block;
+                       color: #eee;
+                       color: rgba(255,255,255,0.75);
+                       text-transform: uppercase;
+                       text-decoration: none;
+                       font-size: 0.7em;
+                       letter-spacing: 0.1em;
+                       border-top: solid 1px rgba(255,255,255,0.15);
+                       line-height: 3em;
+                       -moz-transition: all .25s ease-in-out;
+                       -webkit-transition: all .25s ease-in-out;
+                       -o-transition: all .25s ease-in-out;
+                       -ms-transition: all .25s ease-in-out;
+                       transition: all .25s ease-in-out;
+               }
                
+               .dropotron li:first-child a,
+               .dropotron li:first-child span
+               {
+                       border-top: 0;
+               }
+               
+               .dropotron li:hover > a,
+               .dropotron li:hover > span
+               {
+                       color: #fff;
+               }
+               
+               
+
 /*********************************************************************************/
 /* video home                                                                        */
 /*********************************************************************************/    

diff --git a/css/video-js-tc.css b/css/video-js-tc.css
index 7009307552e6ba06f97decb92719ccdb51b83eb3..80a74ce547b1846e0f375c4fa5926b69fe3bbe54 100644 (file)
--- a/css/video-js-tc.css
+++ b/css/video-js-tc.css
@@ -174,7 +174,7 @@ fonts to show/hide properly.
 .vjs-tc-skin .vjs-play-control {
   width: 5em;
   cursor: pointer;
-  top: -16px;
+  top: -18px;
 }
 .vjs-tc-skin .vjs-play-control:before {
   content:url('../img/play-pause.svg');

diff --git a/index.html b/index.html
index c4fb833fedbfd5164a3a3876c0e9c7132ab99d0f..1e157d10881260b7da07b9c7e9a207d5b70d877b 100644 (file)
--- a/index.html
+++ b/index.html
@@ -39,12 +39,13 @@
       <div class="12u">
          <!-- nav back--> 
          <div id="nav-back" class="skel-panels-fixed color09">
-           <!-- Logo -->
+           <!-- /Logo -->         
+          <!-- Nav -->
+                  <!-- Logo -->
            <div id="logo" >
            <a href="index.html#" ><img src="img/logo-telecasting-site.svg" alt="telecasting mobile web tv" /></a>
            </div>
-           <!-- /Logo -->         
-          <!-- Nav -->
+           <!-- /Logo --> 
           <nav id="nav" >       
           <ul>
             <!-- usage & workflow -->