Merge branch 'develop' into 3.2-docs

django-cms · Nov 3, 2015 · 5539171 · 5539171
2 parents 2136bbc + 6abd813
commit 5539171
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/cms/static/cms/css/cms.base.css b/cms/static/cms/css/cms.base.css
diff --git a/cms/static/cms/css/cms.pagetree.css b/cms/static/cms/css/cms.pagetree.css
diff --git a/cms/static/cms/sass/cms.pagetree.scss b/cms/static/cms/sass/cms.pagetree.scss
@@ -163,6 +163,7 @@ $row-height: 41px;
         padding: 5px 0 4px 5px;
         border-bottom: 1px solid $color-border;
         background: $color-background-light;
+        box-sizing: content-box;
     }
     ul.header li .cont {
         height: 15px;
@@ -266,6 +267,7 @@ $row-height: 41px;
         height: $row-height;
         padding: 0 8px;
         border-left: 1px solid $color-border-medium;
+        box-sizing: content-box;
     }
     li .col2 > div a,
     li .col2 > div span {
@@ -423,6 +425,10 @@ $row-height: 41px;
         display: none;
     }
 }
+#changelist-search {
+    margin-top: 35px;
+    margin-right: 0;
+}
 // remove background assigned from django
 .change-list .filtered {
     min-height: 0;

diff --git a/cms/static/cms/sass/components/_toolbar.scss b/cms/static/cms/sass/components/_toolbar.scss
@@ -396,10 +396,10 @@
         line-height: $login-form-input-height - 2px;
         width: $login-form-input-width;
         margin: 0;
-        padding: 0px $login-form-input-padding-horizontal;
+        padding: 0 $login-form-input-padding-horizontal;
         border: 1px solid $login-form-input-border;
         border-radius: $login-form-input-border-radius;
-        box-shadow: 0px 1px 0px $white;
+        box-shadow: 0 1px 0 $white;
 
         &:focus {
             transition: outline 0.2s;
@@ -408,11 +408,15 @@
         }
     }
     input[type="submit"] {
+        display: block;
         font-size: $login-form-input-font-size - 1px;
         text-transform: uppercase;
         height: $login-form-input-height - 2px;
         line-height: $login-form-input-height - 2px;
         padding: 0 $login-form-submit-padding-horizontal;
+        &:-moz-focus-inner {
+            border: 0;
+        }
     }
 
     .cms-error {
@@ -458,8 +462,8 @@
             position: relative;
             z-index: 10;
             width: 95px;
-            background: transparent;
-            &:focus {
+            &:focus,
+            &:valid {
                 background: $white;
             }
         }