tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #551 from adrexia/scss-tidy

Browse Source 
MINOR: Remove unnecessarily repeated mixins
This commit is contained in:
Ingo Schommer 2012-06-21 12:13:40 -07:00
commit 5eab25cdbc
3 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/GridField.css
View File

@ -71,7 +71,7 @@
.cms table.ss-gridfield-table tr th div.fieldgroup.filter-buttons { min-width: 0; } .cms table.ss-gridfield-table tr th div.fieldgroup.filter-buttons { min-width: 0; }
.cms table.ss-gridfield-table tr th div.fieldgroup.filter-buttons div { width: auto; display: inline; } .cms table.ss-gridfield-table tr th div.fieldgroup.filter-buttons div { width: auto; display: inline; }
.cms table.ss-gridfield-table tr th.main { white-space: nowrap; border-top: 1px solid #a4b4bf; border-left: 1px solid #a4b4bf; color: #fff; background: #98aab6; border-bottom: 1px solid rgba(0, 0, 0, 0.1); } .cms table.ss-gridfield-table tr th.main { white-space: nowrap; border-top: 1px solid #a4b4bf; border-left: 1px solid #a4b4bf; color: #fff; background: #98aab6; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
.cms table.ss-gridfield-table tr th.main span { text-shadow: rgba(0, 0, 0, 0.2) 0px -1px 0; padding-left: 8px; padding-right: 8px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; margin-right: 8px; } .cms table.ss-gridfield-table tr th.main span { text-shadow: rgba(0, 0, 0, 0.2) 0px -1px 0; padding-left: 8px; padding-right: 8px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; margin-right: 8px; }
.cms table.ss-gridfield-table tr th.main.col-listChildrenLink { border-right: none; } .cms table.ss-gridfield-table tr th.main.col-listChildrenLink { border-right: none; }
.cms table.ss-gridfield-table tr th.extra, .cms table.ss-gridfield-table tr th.action { padding: 0; cursor: default; } .cms table.ss-gridfield-table tr th.extra, .cms table.ss-gridfield-table tr th.action { padding: 0; cursor: default; }
.cms table.ss-gridfield-table tr th.extra { position: relative; background: #637276; background: rgba(0, 0, 0, 0.7); padding: 5px; border-top: rgba(0, 0, 0, 0.2); } .cms table.ss-gridfield-table tr th.extra { position: relative; background: #637276; background: rgba(0, 0, 0, 0.7); padding: 5px; border-top: rgba(0, 0, 0, 0.2); }

11
scss/GridField.scss
View File

@ -35,17 +35,6 @@ $gf_border_radius: 5px;
$gf_grid_y: 12px; $gf_grid_y: 12px;
$gf_grid_x: 16px; $gf_grid_x: 16px;
@mixin box-shadow-none {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
@mixin hide-text-overflow {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
o-text-overflow: ellipsis;
}
.cms { .cms {
.ss-gridfield { .ss-gridfield {

61
scss/_mixins.scss
View File

@ -1,61 +0,0 @@
/**
* This file contains mixins relating to specific functionality
*
* Mixins should be stored here rather than individual files
*/
/*Mixin generates the generic button styling for the gridfield*/
@mixin gridFieldButtons{
border:none;
display:block;
text-indent:-9999em;
width:30px;
height:25px; //match the height of the input field
}
/**
Mixin creates a transparent button with a dropdown arrow,
as is used for files in the files up-load area. The arrows
themselves are added in the _style file
**/
@mixin ss-uploadfield-editButton{
&.ss-uploadfield-item-edit {
opacity:0.9;
padding-top: 3px;
padding-bottom: 0;
height:100%;
@include border-radius(0);
&.ui-state-hover{
background:none;
opacity:1;
span.toggle-details{
opacity:1;
}
}
span.toggle-details{
opacity:0.9;
margin-left:3px;
display: inline-block;
width: 5px;
height: 100%;
cursor: pointer;
.toggle-details-icon {
margin-top:1px;
display: inline-block;
width: 8px;
height: 8px;
vertical-align: middle;
&.opened {
margin-top:0;
}
}
}
}
.ui-icon {
display: none;
}
}