Changeset 1447:e73bc6dd21d1

Timestamp:

08/18/13 12:19:05 (10 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

default

Parents:

1437:71b7fa9efe46 (diff), 1446:0939663a1b1a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged in lipki/dotclear/Ticket #1512 (pull request #50) - fixes #1512

Files:

• admin/style/default.css (modified) (1 diff)
• admin/style/default.css (modified) (35 diffs)

admin/style/default.css

@@ -305 +305 @@
      float: left;
      margin:0;
-     padding-top: .5em;
+     padding-top: 4.5em;
      padding-bottom: 1em;
      background: #f7f7f7;

admin/style/default.css

@@ -53 +53 @@
      color: #d30e60;
 }
+.page-title img {
+     padding-left: .6rem;
+     vertical-align: middle;
+}
 #content > h2 {
      padding: 0 1.8rem .6rem;
@@ -69 +73 @@
      font-size: 1em;
      color: #575859;
+}
+#entry-sidebar h5 {
+     font-weight: normal;
+     color: #333;
+}
+.entry-status label img {
+     padding-left: .4rem;
+     vertical-align: text-top;
 }
 p, div.p {
@@ -260 +272 @@
 /* -------------------------------------------------------------- layout - onglets */
 .part-tabs ul {
-     padding: .5em 0 .3em 1rem;
-     border-bottom: 1px solid #ccc;
+     padding: .5em 0 .3em 1.2rem;
+     border-bottom: 1px solid #ddd;
 }
 .part-tabs li {
@@ -269 +281 @@
 }
 .part-tabs li a {
-     padding: .5em 1em;
-     margin-right: .5em;
-     border: 1px solid #ccc;
+     padding: .5em 2em;
+     margin-right: -1px;
+     border: 1px solid #aaa;
      border-bottom: none;
-     background: #efefef;
      text-decoration: none;
-     color: #000;
-     background-color:#ededed;
+     color: #333;
+     background-color:#E4E0EC;
 }
 .part-tabs li a:hover, .part-tabs li a:focus {
@@ -285 +296 @@
 .part-tabs li.part-tabs-active a {
      background: #fff;
-     border: 1px solid #d30e60;
-     color: #d30e60;
      font-weight: bold;
      border-bottom-color: #fff;
+     padding-bottom: .7rem;
 }
 /* ------------------------------------------------------------------ main-menu */
@@ -320 +330 @@
      background-repeat: no-repeat;
      background-position: 8px .3em;
+}
+#main-menu li.active {
+     background-color: #fff;
 }
 #main-menu a {
@@ -358 +371 @@
      background: #dfdfdf;
      border-color: #999;
-     color: #666;
+     color: #444;
      border-bottom-right-radius: .6em;
      border-top-right-radius: .6em;
@@ -380 +393 @@
      color: #000;
      font-variant: small-caps;
-}
-#favorites-menu a {
-     color: #333;
+     padding-top: .6rem;
 }
 /* ------------------------------------------------------------------ footer */
@@ -435 +446 @@
 /* ------------------------------------------------------------------ dashboard */
 #dashboard-main {
-     float: left;
-     overflow: hidden;
-     padding: 1em 2% 1em 0;
-     width: 70%;
-}
-#dashboard-main.fullwidth {
-     width: 100%;
      padding: 1em 0;
-     float: none;
 }
 #icons {
@@ -453 +456 @@
      width: 210px;
      text-align: center;
-     margin: 2em 0;
+     margin: 1em 0 2em;
+     padding: 1em 0;
      display:inline-block;
+     vertical-align: top;
 }
 #icons a,
@@ -466 +471 @@
 #icons a span {
      border-bottom: 1px dotted #f90;
+     color: #333;
+}
+#icons a img {
+     padding: 2em;
+     background: #eee;
+     border-radius: 1.6rem;
+     box-shadow: 0 3px 3px 0 #ccc;
+     margin-bottom: .6rem;
+}
+#icons a img:hover, #icons a:focus img {
+     background-color: #BBDB58;
 }
 #icons a:focus span, #icons a:hover span {
@@ -471 +487 @@
 }
 #quick {
-     clear: left;
      margin-top: 2em;
 }
@@ -486 +501 @@
 }
 #dashboard-items {
-     float: left;
-     width: 27%;
-     overflow: hidden;
-     padding-bottom: 1em;
-     padding-top: 3em;
+     margin: 3em auto;
+     display: table;
+     width: 100%;
+     border-collapse: collapse;
+}
+.db-item {
+     display: table-cell;
+     padding: 1em 3em;
+     vertical-align: top;
+     border: 1px solid #ccc;
 }
 #dashboard-items img {
@@ -515 +535 @@
 }
 
-#upg-notify {
-}
-#upg-notify ul {
-     padding-left: 15px;
-}
-#upg-notify li {
-     color: #fff;
-}
 /* ------------------------------------------------------------------ post */
 #entry-wrapper {
@@ -531 +543 @@
 #entry-content {
      margin-right: 19em;
-     margin-left: 1.2rem;
+     margin-left: 0;
+}
+.multi-part {
+     padding-left: 1.2rem;
 }
 #entry-content label {
@@ -542 +557 @@
      float: right;
 }
+#entry-sidebar input[type="text"],
+#entry-sidebar select {
+     width: 14em; /* to prevent inline with label */
+}
 .box {
-     border-bottom: 2px solid #A2CBE9;
+     border-bottom: 1px solid #ddd;
      margin-bottom: 1em;
 }
@@ -717 +736 @@
 /* -------------------------------------------------------------------- Themes */
 #themes {
-     border-bottom: 1px solid #ccc;
-     margin: 1em 0;
+     margin: 0;
+     width: 100%;
+     padding: 0;
+}
+#themes h3 {
 }
 #themes div.theme-details {
-     clear: left;
      border-top: 1px solid #ccc;
-     padding: 1em 0;
+     padding: 12px;
+     display: inline-block;
+     vertical-align: top;
+     width: 284px;
+}
+.current-theme {
+     background: #eef;
 }
 #themes div.theme-details:hover {
-     background: #eee;
+     background: #f0f0f0;
 }
 #themes div.theme-details div.theme-shot {
-     float: left;
 }
 #themes div.theme-details div.theme-shot img {
      display: block;
-     width: 57px;
-     height: 50px;
      border: 1px solid #ccc;
+     margin-bottom: 1.5em;
 }
 #themes div.theme-details div.theme-info {
-     margin-left: 67px;
 }
 #themes div.theme-details div.theme-info span.theme-desc {
@@ -747 +771 @@
 }
 #themes div.theme-details div.theme-actions {
-     margin-left: 67px;
-}
+}
+#themes-actions {
+     border-bottom: 1px solid #999;
+     margin-bottom: 3em;
+}
+.theme-css {
+     display: block;
+}
+
 /* Themes list, JS version */
 #themes-wrapper {
+     display: table;
+}
+#themes-wrapper #themes {
+     display: table-cell;
+     vertical-align: top;
 }
 #theme-box {
-     border: 1px solid #999;
-     border-left: none;
-     padding: 5px;
-     float: right;
-     height: 420px;
-     width: 320px;
-     overflow: auto;
+     display: table-cell;
+     vertical-align: top;
+     padding: 1rem 0; 
+     width: 312px;
+     background: #eef;
+     border: 1px solid #ccc;
+     border-radius: 3px;
 }
 #theme-box div.theme-shot img {
      display: block;
-     margin: 0 0 0 10px;
+     margin: 0 16px;
      width: 280px;
      height: 245px;
@@ -769 +805 @@
 }
 #theme-box div.theme-info {
-     margin: 1em 0 0 10px;
-}
-#theme-box h3 {
-     margin: 0;
-}
-#theme-box div.theme-info span {
-     display: block;
+     margin: 1em 16px;
+}
+#theme-box h4 {
+     color: #000;
 }
 #theme-box span.theme-version {
@@ -788 +821 @@
 }
 #theme-box div.theme-actions {
-     margin-left: 10px;
-}
-#themes-wrapper #themes {
-     border: 1px solid #999;
-     overflow: auto;
-     height: 420px;
-     padding: 5px;
-     margin: 0;
+     padding: 0 16px;
 }
 #themes div.theme-details-js {
@@ -801 +827 @@
      width: 120px;
      height: 150px;
-     margin: 0 10px 20px;
-     padding: 10px 10px 0;
+     margin: 0 12px 24px;
+     padding: 12px 12px 0;
      text-align: center;
      background: #f3f3f3;
-     border: 1px solid #f3f3f3;
+     border: 1px solid #ddd;
      cursor: pointer;
      border-radius: 4px;
@@ -813 +839 @@
 }
 #themes div.theme-details-js.theme-selected {
-     background: #E5E3DA;
+     background: #ddd;
      border: 1px solid #999;
 }
@@ -820 +846 @@
      height: 105px;
      border: 1px solid #fff;
-}
-#themes div.theme-details-js h3 {
-     font-family: inherit;
-     font-weight: normal;
-     margin: 0;
-     padding: 0;
 }
 /* ----------------------------------------------------------  Plugins list */
@@ -956 +976 @@
      color: #fff;
 }
-#content > .message, #content > .error {
-     margin-right: 14em
-}
 /* ------------------------------------------------------------------ navigation */
 .anchor-nav {
@@ -968 +985 @@
 .nav_prevnext {
      margin-bottom: 2em;
-     color: #ccc;
+     color: #fff;
 }
 .nav_prevnext a, a.back {
-     border: 1px solid #ccc;
-     padding: .2rem .5rem;
-     background-color: #eef;
+     border: 1px solid #ddd;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #f0f0f0;
 }
 a.back:before {
      content: "\ab\a0";
 }
-
+a.onblog_link {
+     color: #333;
+     float: right;
+     border: 1px solid #eee;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #ffe;
+}
 /* ------------------------------------------------------------------ debug */
 #debug {
@@ -1219 +1244 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #ccc;
-     background: #eef;
+     border-color: #333;
+     background: #fff;
      margin-bottom: 0.5em;
+     border-radius: 3px;
 }
 optgroup {
@@ -1285 +1311 @@
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .3em .2em;
-     border: 1px solid #99f;
-}
-.form-note a {border-bottom: 1px solid #99f;}
-
+     background: #f5eaff url(info.png) no-repeat .3em .2em;
+     border: 1px solid #ddbaff;
+}
+.form-note a {border-bottom: 1px solid #ddbaff;}
+
+label.ib {
+     display: inline-block;
+}
 label.classic {
      display: inline;
@@ -1338 +1367 @@
 a.form-control {
      display: none;
-     font-weight: bold;
-     background: url(magnifier.png) no-repeat 0 0;
-     color: green;
+     background: url(../images/expand.png) no-repeat .4rem center;
      padding-left: 20px;
+     color: #000;
 }
 .constrained {
@@ -1419 +1447 @@
 input[type=submit].delete {
      color: #c00;
-     padding-bottom: .1em;
+     padding-bottom: .2rem;
 }
 #entry-content .delete {
@@ -1447 +1475 @@
      border:1px solid #83c41a;
      padding:.6rem 1.8rem;
-     text-shadow:1px 1px 0 #689324;
      color: #000;
      text-shadow: 1px 1px 0 #BBDB58;
@@ -1462 +1489 @@
 .button-add:focus {
      outline: dotted 1px;
-}
-.button.add:active {
-     position:relative;
-     top:1px;
 }
 
@@ -1501 +1524 @@
 }
 
+/* ------------------------------------------------------- Filters */
+#filters-form {
+     border: 1px dashed #999;
+     border-radius: .6rem;
+     margin-bottom: 2em;
+     padding: .5em 1em 0;
+}
+#filters-form .table {
+     display: table;
+     width: 100%;
+     padding: 0;
+     margin-bottom: 1em;
+     margin-top: 1.5em;
+}
+#filters-form .cell {
+     padding: 0 2em 0 0;
+     display: table-cell;
+     vertical-align: top;
+}
+#filters-form .filters-options {
+     padding-left: 2em;
+     border-left: 1px solid #ccc;
+}
+#filters-form label.ib, span.ib {
+     width:7em;
+     display: inline-block;
+}
+#filters-form label.ibw, span.ibw {
+     width: 9em;
+     display: inline-block;
+}
+#filters-form select {
+     width: 14em;
+}
+
+/* ---------------------------------------------------- Pagination */
+.pagination {
+     height: 22px;
+     margin-top: 1em;
+     line-height: 22px;
+     padding: 0 1rem; 
+     border: 1px solid #ddd;
+     overflow: hidden; 
+     background: #e1e1e1; 
+     background: -moz-linear-gradient(center top , #f2f2f2, #e1e1e1); 
+     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1)); 
+     -moz-border-radius: 4px; 
+     -webkit-border-radius: 4px; 
+     border-radius: 4px; 
+}
+.pagination a, .pagination strong {
+     height: 20px;
+     border: none;
+     padding: 2px 6px; 
+     background-color : transparent;
+     background-position : 50% 50%;
+     background-repeat: no-repeat;
+}
+.pagination a:hover, .pagination strong {
+     border-color : #ccc;
+     background-color: #fff;
+}
+
 /* ---------------------------------------------------------------------------
      Media queries vite fait en attendant la reprise complète du layout
 ---------------------------------------------------------------------------- */
 @media screen and (max-width: 920px) {
-     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;}
+     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;
+}
      #top h1 a:link {
           background: transparent url(dc_logos/b-dotclear120.png) no-repeat -180px 6px; 
@@ -1523 +1610 @@
           line-height: 3.2rem;
      }
+     #info-box1 {margin-left: 1rem;}
      #info-box1 select {width: 14rem;}
      #main-menu, #main, #content, #content h2, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
@@ -1541 +1629 @@
      .smallscreen {display: none;}
      #help-button {width:20px; overflow: hidden;}
-     #info-box1 {margin-left: 1rem;}
+     #info-box2 {float:none;}
+     #dashboard-items div {display: block;margin-bottom: 1em; padding: 0 1em;}
 }
 @media screen and (max-width: 492px) {
@@ -1548 +1637 @@
      .page-title, #info-boxes, .media-item {display: inline-block;}
      div.media-list .media-item {width: 90%; float: none}
+     #info-box1 select {width: 12rem; margin-right: .6rem;}
      #info-box1 p.nomobile, label.nomobile {display: none;}
      #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}