Skip to content
Browse files

MINOR Moved ModelAdmin styles into separate file

  • Loading branch information...
1 parent 8dd64bd commit 3202d1293367a7d70baf2c1c1139fa9e1126727b @chillu chillu committed
Showing with 80 additions and 81 deletions.
  1. +14 −14 admin/css/screen.css
  2. +65 −0 admin/scss/_ModelAdmin.scss
  3. +0 −66 admin/scss/_style.scss
  4. +1 −1 admin/scss/screen.scss
View
28 admin/css/screen.css
@@ -231,20 +231,6 @@ html article, html aside, html details, html figcaption, html figure, html foote
.message.good { background-color: #99cc66; border-color: #669933; }
.message p { margin: 0; }
-/** -------------------------------------------- ModelAdmin -------------------------------------------- */
-.ModelAdmin .ResultAssemblyBlock { display: none; }
-.ModelAdmin .cms-content-tools h3.cms-panel-header { display: none; }
-.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav { overflow: hidden; }
-.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav li { max-width: 99%; }
-.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav li a { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 85%; }
-.ModelAdmin .cms-content-tools #SearchForm_holder #ModelClassSelector { margin-bottom: 2px; }
-.ModelAdmin .cms-content-tools #SearchForm_holder #ModelClassSelector select { width: 96%; }
-.ModelAdmin .cms-content-tools #SearchForm_holder div.tab { border: 1px solid #aaa; margin-top: -1px; background: #fff; padding: 8px; }
-.ModelAdmin .cms-content-tools #SearchForm_holder div.tab h3 { margin-top: 16px; margin-bottom: 10px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
-.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form input { margin: 0px; }
-.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form .field { border-bottom: 0px; margin-bottom: 6px; }
-.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form .Actions button.ss-ui-action-minor { display: none; }
-
/** -------------------------------------------- "Add page" dialog -------------------------------------------- */
.cms-page-add-form-dialog { display: none; }
.cms-page-add-form-dialog #PageType li { padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; }
@@ -538,3 +524,17 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-menu-list li ul.collapsed-flyout li.first a { border-top: 1px solid #92a5b2; }
.cms-menu-list.collapsed li .text { display: none; }
.cms-menu-list.collapsed li > li { display: none; }
+
+/** -------------------------------------------- ModelAdmin -------------------------------------------- */
+.ModelAdmin .ResultAssemblyBlock { display: none; }
+.ModelAdmin .cms-content-tools h3.cms-panel-header { display: none; }
+.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav { overflow: hidden; }
+.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav li { max-width: 99%; }
+.ModelAdmin .cms-content-tools #SearchForm_holder ul.ui-tabs-nav li a { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 85%; }
+.ModelAdmin .cms-content-tools #SearchForm_holder #ModelClassSelector { margin-bottom: 2px; }
+.ModelAdmin .cms-content-tools #SearchForm_holder #ModelClassSelector select { width: 96%; }
+.ModelAdmin .cms-content-tools #SearchForm_holder div.tab { border: 1px solid #aaa; margin-top: -1px; background: #fff; padding: 8px; }
+.ModelAdmin .cms-content-tools #SearchForm_holder div.tab h3 { margin-top: 16px; margin-bottom: 10px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
+.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form input { margin: 0px; }
+.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form .field { border-bottom: 0px; margin-bottom: 6px; }
+.ModelAdmin .cms-content-tools #SearchForm_holder div.tab form .Actions button.ss-ui-action-minor { display: none; }
View
65 admin/scss/_ModelAdmin.scss
@@ -0,0 +1,65 @@
+/** --------------------------------------------
+ * ModelAdmin
+ * -------------------------------------------- */
+
+.ModelAdmin {
+ // Disable by default, will be replaced by more intuitive column selection in new data grid
+ .ResultAssemblyBlock {
+ display: none;
+ }
+ .cms-content-tools {
+ h3.cms-panel-header {
+ display:none;
+ }
+ #SearchForm_holder {
+ ul.ui-tabs-nav {
+ overflow:hidden;
+ li {
+ max-width:99%;
+ a {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ //above 3 lines can also be achieved with mixin below
+ //@include ellipsis;
+ max-width:85%;
+ }
+ }
+ }
+ #ModelClassSelector {
+ margin-bottom:2px;
+ select {
+ width:96%;
+ }
+ }
+ div.tab {
+ border:1px solid #aaa; //following color from the jquery smoothness theme
+ margin-top:-1px;
+ background:#fff; //backround is kept white to follow tabs
+ padding:$grid-horizontal;
+
+ h3 {
+ margin-top:16px;
+ margin-bottom:10px;
+ @include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 10%))
+ }
+
+ form {
+ input {
+ margin:0px;
+ }
+ .field {
+ border-bottom:0px;
+ margin-bottom:6px;
+ }
+ .Actions {
+ button.ss-ui-action-minor {
+ //removing the "clear search" button
+ display:none;
+ }
+ }
+ }
+ }
+ }
+ }
+}
View
66 admin/scss/_style.scss
@@ -282,72 +282,6 @@ html,body {
}
/** --------------------------------------------
- * ModelAdmin
- * -------------------------------------------- */
-
-.ModelAdmin {
- // Disable by default, will be replaced by more intuitive column selection in new data grid
- .ResultAssemblyBlock {
- display: none;
- }
- .cms-content-tools {
- h3.cms-panel-header {
- display:none;
- }
- #SearchForm_holder {
- ul.ui-tabs-nav {
- overflow:hidden;
- li {
- max-width:99%;
- a {
- white-space: nowrap;
- overflow: hidden;
- text-overflow:ellipsis;
- //above 3 lines can also be achieved with mixin below
- //@include ellipsis;
- max-width:85%;
- }
- }
- }
- #ModelClassSelector {
- margin-bottom:2px;
- select {
- width:96%;
- }
- }
- div.tab {
- border:1px solid #aaa; //following color from the jquery smoothness theme
- margin-top:-1px;
- background:#fff; //backround is kept white to follow tabs
- padding:$grid-horizontal;
-
- h3 {
- margin-top:16px;
- margin-bottom:10px;
- @include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 10%))
- }
-
- form {
- input {
- margin:0px;
- }
- .field {
- border-bottom:0px;
- margin-bottom:6px;
- }
- .Actions {
- button.ss-ui-action-minor {
- //removing the "clear search" button
- display:none;
- }
- }
- }
- }
- }
- }
-}
-
-/** --------------------------------------------
* "Add page" dialog
* -------------------------------------------- */
View
2 admin/scss/screen.scss
@@ -46,4 +46,4 @@
@import "style.scss";
@import "tree.scss";
@import "menu.scss";
-
+@import "ModelAdmin.scss";

0 comments on commit 3202d12

Please sign in to comment.
Something went wrong with that request. Please try again.