Changeset 1309:eb5238f5be85

Timestamp:

08/06/13 17:26:09 (11 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Login screen has to be as happy as a Dotclear's user. (And some very few changes on admin pages.)

Files:

• admin/auth.php (modified) (1 diff)
• admin/style/default.css (modified) (29 diffs)
• admin/style/dotclear-logo2.png (modified) (previous)
• admin/style/install/w-logo.png (modified) (previous)
• inc/admin/lib.dc.page.php (modified) (2 diffs)

admin/auth.php

@@ -395 +395 @@
           __('Remember my ID on this computer').'</label></p>'.
           
-          '<p><input type="submit" value="'.__('log in').'" /></p>';
+          '<p><input class="add button" type="submit" value="'.__('log in').'" /></p>';
           
           if (!empty($_REQUEST['blog'])) {

admin/style/default.css

@@ -23 +23 @@
      padding: 0;
 }
-body.auth {
-     background: #fff;
-}
 
 a, a:link, a:visited {
@@ -46 +43 @@
      color: #666;
      font-size: 1.8rem;
-     padding: 0 0 2em;
+     padding: 0 0 1.8rem;
      font-weight: normal;
 }
@@ -65 +62 @@
 hr {
      height: 1px;
-     border-width: 1px 0 0 0;
+     border-width: 1px 0 0;
      border-color: #999;
      border-style: solid;
@@ -91 +88 @@
 #header {
      background: #575859;
-     height: 3.6rem;
+     height: 3em;
      position: relative;
      border-bottom: 4px solid #A2CBE9;
@@ -101 +98 @@
      overflow: hidden;
      position: absolute;
-     top: 3.6rem;
+     top: 3em;
      left: 0;
      background: #A2CBE9;
-     width: 14em;
+     width: 14.5em;
      }
 #prelude li {
@@ -112 +109 @@
 }
 #prelude li a {
-     padding: .5rem 1rem .4rem 1.5rem;
+     padding-left: 1.6rem;
      background: #A2CBE9;
      color: #000;
@@ -120 +117 @@
      margin: 0;
      padding: 0;
-     width: 14em;
+     width: 14.5em;
      float: left;
-     line-height: 3.6rem;
+     line-height: 3em;
 }
 #top h1 {
@@ -135 +132 @@
      top: 0;
      left: 0;
-     width: 14rem;
+     width: 14.5em;
      height: 3.6rem;
      border: none;
@@ -146 +143 @@
      background: #575859;
      font-size: 1em;
-     line-height: 3.6rem;
-     text-align: justify;
+     line-height: 3em;
 }
 #info-box1 {
@@ -169 +165 @@
 }
 #info-box1 select {
-     width: 15em;
+     width: 14.5em;
 }
 #info-box1 a img, #info-box2 a img {
@@ -175 +171 @@
      padding-left: .3em;
      }
-#info-box1 a, #info-box2 a {
+#info-boxes a {
      background: #575859;
      font-weight: bold;
@@ -199 +195 @@
      color: #999;
 }
-/* prelude */
+/* main blocks */
 #wrapper {
      width: 100%;
@@ -206 +202 @@
      width: 100%;
      float: right;
-     margin-left: -14em;
+     margin-left: -14.5em;
      margin-top: 0;
      background: #fff url(dc_bg.png);
 }
 #content {
-     margin: 0 0 0 14em;
+     margin: 0 0 0 14.5em;
      padding: .9rem 1.8rem 1.8rem;
      background: #fff url(dc_bg_title.png) repeat-x center top;
@@ -254 +250 @@
 /* -------------------------------------------------------------- layout - onglets */
 .part-tabs ul {
-     padding: .5em 0 .3em 1.2rem;
+     padding: .5em 0 .3em 1em;
      border-bottom: 1px solid #ccc;
 }
@@ -292 +288 @@
 /* ------------------------------------------------------------------ main-menu */
 #main-menu {
-     width: 14em;
+     width: 14.5em;
      float: left;
-     margin-top: 4.4rem;
-     padding-bottom: 1rem;
+     margin:0;
+     padding-top: 4em;
+     padding-bottom: 1em;
      background: #f7f7f7;
 }
@@ -309 +306 @@
 }
 #main-menu ul {
-     font-size: 1.2rem;
      margin: 0 0 1.8rem 0;
      padding: 0;
@@ -366 +362 @@
      width: 18em;
      margin: 1.5em auto 0;
-     font-size: 1.1em;
+     font-size: 1.4rem;
 }
 #login-screen h1 {
@@ -373 +369 @@
      height: 50px;
      margin-bottom: .5em;
-     margin-left: .5em;
+     margin-left: 0;
 }
 #login-screen fieldset, #login-screen .fieldset {
-     border: 1px solid #999;
+     border: 1px solid #A8DC26;
      padding: 1em 1em 0 1em;
      border-radius: 4px;
 }
+#login-screen legend {
+     border: 1px solid #A8DC26;
+}
 #login-screen input[type=text], #login-screen input[type=password], #login-screen input[type=submit] {
      width: 100%;
 }
 #login-screen #issue {
-     margin-left: 1em;
-     font-size: 1em;
+     margin-left: 1.5rem;
+     font-size: 1.2rem;
 }
 #login-screen #issue strong {font-weight: normal;}
@@ -793 +792 @@
 }
 #help-button {
-     background: transparent url(../images/page_help.png) no-repeat .6rem center;
+     background: transparent url(../images/page_help.png) no-repeat 6px center;
      position: absolute;
      top: 3.6rem;
@@ -800 +799 @@
      cursor: pointer;
      color: #2373A8;
-     line-height: 4rem;
+     line-height: 4.2rem;
 }
 #help-button span {
@@ -878 +877 @@
 }
 p.error, p.message, p.static-msg {
-     padding-top: 1em;
-     padding-bottom: 1em;
+     padding-top: 1rem;
+     padding-bottom: 1rem;
 }
 div.error, p.error {
@@ -931 +930 @@
 p.top-add {
      text-align: right;
-     margin: 2rem 0 0;
+     margin: 0;
      }
 p.top-add a {
@@ -1023 +1022 @@
 }
 tr.line:hover {
-     background: #ddd;
+     background: #f3f3f3;
 }
 caption {
@@ -1035 +1034 @@
      border-width: 0 0 1px 0;
      border-style: solid;
-     border-color: #ccc;
+     border-color: #e3e3e3;
      padding: .4rem .5rem;
      vertical-align: top;
@@ -1041 +1040 @@
 th {
      text-align: left;
-     border-bottom-color: #666;
+     border-bottom-color: #aaa;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
@@ -1147 +1146 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #000 #ccc #ccc #000;
+     border-color: #666 #ccc #ccc #999;
 }
 input.invalid, textarea.invalid, select.invalid {
@@ -1237 +1236 @@
      display: inline;
      position: absolute;
-     left: 15em;
+     left: 14.5em;
      top: 0;
 }
@@ -1262 +1261 @@
 
 /* --------------------------------------------------------------- buttons */
-h2 a.button {
-     color: #333;
-     font-weight: normal;
-     font-size: .75em;
-     vertical-align: middle;
-}
 /* commun */
 input[type=submit],
@@ -1426 +1419 @@
      Media queries vite fait en attendant la reprise complète du layout
 ---------------------------------------------------------------------------- */
-@media screen and (max-width: 880px) {
- #top, #top h1 a {width: 42px;overflow:hidden;}
- #top, #info-boxes, #info-box1, #info-box2 {display:inline-block;vertical-align:middle;margin:0;padding:0;line-height: 3.2rem;}
- #info-box1 select {width: 14rem;}
- #help-button {position: absolute;top: 8rem; right:0;}
-}
-@media screen and (max-width: 680px) {
- .nomobile, #help-button {display: none;}
- #main-menu, #main, #content, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
-    display:block;
-    width: 98% !important;
-    margin:0 auto;
-    padding:0;
-    float:none;
-    text-align: left;
-    clear: both;
-  }
-}
+@media screen and (max-width: 920px) {
+     #top, #top h1 a {width: 42px !important;overflow:hidden;}
+}
+@media screen and (max-width: 800px) {
+     #top, #info-boxes, #info-box1, #info-box2 {
+          display:inline-block;
+          vertical-align:middle;
+          margin:0;
+          padding:0;
+          line-height: 3.2rem;
+     }
+     #info-box1 select {width: 14rem;}
+     #help-button {position: absolute; top: 8rem; right:0;}
+     #main-menu, #main, #content, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
+     display:block;
+     width: 98%;
+     margin:0 auto;
+     padding:0;
+     float:none;
+     text-align: left;
+     clear: both;
+     }
+     #content {
+          width: 100%;
+          padding-top: .5em;
+     }
+}
+@media screen and (max-width: 720px) {
+     .smallscreen {display: none;}
+}
+@media screen and (max-width: 492px) {
+     #info-boxes {float:right;}
+     #info-box1, #info-box2 {display: block;}
+     #header {height:7.2rem;}
+     #help-button {top: 11rem;}
+     #info-boxes {display: inline-block; height: auto;}
+     #top h1 a, #top {height: auto;}
+}

inc/admin/lib.dc.page.php

@@ -74 +74 @@
                $blog_box =
                '<p><label for="switchblog" class="classic">'.
-               __('Blogs:').' '.
+               __('Blogs:').'</label> '.
                $core->formNonce().
                form::combo('switchblog',$blogs,$core->blog->id).
-               '</label></p>'.
+               '</p>'.
                '<noscript><p><input type="submit" value="'.__('ok').'" /></p></noscript>';
           }
@@ -138 +138 @@
           '</div>'.
           '<div id="info-box2">'.
-          '<a class=" nomobile"'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="index.php">'.__('My dashboard').'</a>'.
-          '<span class="nomobile"> | </span><a class=" nomobile"'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active nomobile"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
-          '<span class="nomobile"> | </span><a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
+          '<a class="smallscreen"'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="index.php">'.__('My dashboard').'</a>'.
+          '<span class="smallscreen"> | </span><a class="smallscreen"'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active smallscreen"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
+          '<span class="smallscreen"> | </span><a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
           '</div>'.
           '</div>'.