Skip to content

Commit 97395cf

Browse files
discordierdiscordier
committed
Merge pr #1286 from @zonky2
This changes the CSS to be generated from SCSS files and cleans them up.
2 parents b68593b + 4676672 commit 97395cf

6 files changed

Lines changed: 363 additions & 385 deletions

File tree

‎src/CoreBundle/Resources/public/css/style.css‎

Lines changed: 138 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* This file is part of MetaModels/core.
33
*
4-
* (c) 2012-2018 The MetaModels team.
4+
* (c) 2012-2019 The MetaModels team.
55
*
66
* For the full copyright and license information, please view the LICENSE
77
* file that was distributed with this source code.
@@ -13,150 +13,145 @@
1313
* @author Andreas Isaak <info@andreas-isaak.de>
1414
* @author Ingolf Steinhardt <info@e-spin.de>
1515
* @author Sven Baumann <baumann.sv@gmail.com>
16-
* @copyright 2012-2018 The MetaModels team.
16+
* @author Carolina Koehn <ck@kikmedia.de>
17+
* @copyright 2012-2019 The MetaModels team.
1718
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
1819
* @filesource
1920
*/
2021

21-
body[class*="version_3"] a[class*="header_"] {
22-
margin-left:15px;
23-
}
24-
25-
.header_css_fields {
26-
padding:2px 0px 3px 20px;
27-
background-image:url(../images/icons/fields.png);
28-
background-position:left center;
29-
background-repeat:no-repeat;
30-
}
31-
32-
.header_add_all {
33-
padding:2px 0px 3px 20px;
34-
background-image:url(../images/icons/dca_add.png);
35-
background-position:left center;
36-
background-repeat:no-repeat;
37-
}
38-
39-
.rendersetting_add_all {
40-
background-image:url(../images/icons/rendersettings_add.png);
41-
}
42-
43-
/*------------------------------------------------------------------------*/
44-
45-
#table_tl_metamodel_dcasetting_ tr.odd td {
46-
background-color:transparent;
47-
}
48-
49-
.dca_palette {
50-
color:#8AB858;
51-
margin:6px 0;
52-
padding-left:24px;
53-
background:url(../../../../themes/flexible/images/palOpen.gif) 3px center no-repeat;
54-
}
55-
56-
.dca_combine.widget td:empty {
57-
display:none;
58-
}
59-
60-
.mm_problem_display {
61-
margin-bottom:30px;
62-
}
63-
64-
.mm_problem_display ul {
65-
padding:0; list-style:none;
66-
}
67-
68-
form[id*="tl_metamodel_"] .wizard a[data-lightbox] img,
69-
form[id*="tl_metamodel_"] .wizard a[onclick] img {
70-
margin-top:8px;
71-
}
72-
73-
div[class*="table_tl_metamodel_"] .tl_file_list {
74-
padding:4px 0 6px;
75-
}
76-
77-
fieldset.tl_subdca {
78-
padding:0;
79-
margin:0;
80-
border:none;
81-
}
82-
83-
.tl_subdca > legend {
84-
margin:0;
85-
padding:10px 0 10px 23px;
86-
background:url(../images/icons/filter_settings.png) no-repeat left center;
87-
}
88-
89-
.tl_subdca legend label {
90-
font-weight:bold;
91-
}
92-
93-
/*------------------------------------------------------------------------*/
94-
95-
body[class*="version_3"] .tl_file_list .field_type img,
96-
body[class*="version_2"] .tl_content .field_type img,
97-
body[class*="version_2"] .tl_content_right + img {
98-
margin-right:8px;
99-
float:left;
100-
}
101-
102-
/*------------------------------------------------------------------------*/
103-
104-
.list_view li:first-child .tl_content {
105-
border-top:1px solid #E9E9E9;
106-
}
107-
108-
.list_view .tl_content > div:first-child {
109-
float:left;
110-
}
111-
112-
.tl_class {
113-
color:#c6c6c6;
114-
}
115-
116-
.multicolumnwizard .fallback_language span {
117-
font-weight:bold;
118-
}
119-
120-
.tl_formbody {
121-
position:relative;
122-
}
123-
124-
input[readonly],
125-
textarea[readonly],
126-
input[readonly]:focus,
127-
textarea[readonly]:focus {
128-
background-color: #ebebe4;
129-
}
130-
131-
form[id^=mm_] .sort_hint{
132-
display:none;
133-
}
134-
135-
/* Wildcard */
136-
.wc_info {
137-
margin: 0;
138-
}
139-
.wc_label {
140-
width: 31px;
141-
display: inline-block;
142-
}
143-
144-
/*------------------------------------------------------------------------*/
145-
146-
.clx {
147-
overflow:visible;
148-
}
149-
150-
.w50x {
151-
height:auto;
152-
}
153-
154-
.long .chzn-container {
155-
width:100%;
156-
}
157-
158-
.widget.translat-attr label {
159-
padding-left: 20px;
160-
display: inline-block;
161-
background:url(../images/icons/locale.png) no-repeat left center;
22+
.header_css_fields {
23+
padding: 2px 0 3px 20px;
24+
background-image: url("../images/icons/fields.png");
25+
background-position: left center;
26+
background-repeat: no-repeat;
16227
}
28+
29+
.header_add_all {
30+
padding: 2px 0 3px 20px;
31+
background-image: url("../images/icons/dca_add.png");
32+
background-position: left center;
33+
background-repeat: no-repeat;
34+
}
35+
36+
.rendersetting_add_all {
37+
background-image: url("../images/icons/rendersettings_add.png");
38+
}
39+
40+
.dca_palette {
41+
color: #8ab858;
42+
margin: 6px 0;
43+
padding-left: 24px;
44+
background: url("../../../../themes/default/images/palOpen.gif") 3px center no-repeat;
45+
}
46+
47+
.mm_problem_display {
48+
margin-bottom: 30px;
49+
}
50+
51+
.mm_problem_display ul {
52+
padding: 0;
53+
list-style: none;
54+
}
55+
56+
.tl_subdca > legend {
57+
margin: 0;
58+
padding: 10px 0 10px 23px;
59+
background: url("../images/icons/filter_settings.png") no-repeat left center;
60+
}
61+
62+
.tl_subdca legend label {
63+
font-weight: bold;
64+
}
65+
66+
.list_view li:first-child .tl_content {
67+
border-top: 1px solid #ebebe4;
68+
}
69+
70+
.list_view .tl_content > div:first-child {
71+
float: left;
72+
}
73+
74+
.tl_class {
75+
color: #c6c6c6;
76+
}
77+
78+
.tl_formbody {
79+
position: relative;
80+
}
81+
82+
input[readonly] {
83+
background-color: #ebebe4;
84+
}
85+
86+
input[readonly]:focus {
87+
background-color: #ebebe4;
88+
}
89+
90+
textarea[readonly] {
91+
background-color: #ebebe4;
92+
}
93+
94+
textarea[readonly]:focus {
95+
background-color: #ebebe4;
96+
}
97+
98+
.wc_info {
99+
margin: 0;
100+
}
101+
102+
.wc_label {
103+
width: 31px;
104+
display: inline-block;
105+
}
106+
107+
.clx {
108+
overflow: visible;
109+
}
110+
111+
.w50x {
112+
height: auto;
113+
}
114+
115+
#table_tl_metamodel_dcasetting_ tr.odd td {
116+
background-color: transparent;
117+
}
118+
119+
.dca_combine.widget td:empty {
120+
display: none;
121+
}
122+
123+
form[id*="tl_metamodel_"] .wizard a[data-lightbox] img {
124+
margin-top: 3px;
125+
}
126+
127+
form[id*="tl_metamodel_"] .wizard a[onclick] img {
128+
margin-top: 3px;
129+
}
130+
131+
div[class*="table_tl_metamodel_"] .tl_file_list {
132+
padding: 4px 0 6px;
133+
}
134+
135+
fieldset.tl_subdca {
136+
padding: 0;
137+
margin: 0;
138+
border: none;
139+
}
140+
141+
.multicolumnwizard .fallback_language span {
142+
font-weight: bold;
143+
}
144+
145+
form[id^=mm_] .sort_hint {
146+
display: none;
147+
}
148+
149+
.long .chzn-container {
150+
width: 100%;
151+
}
152+
153+
.widget.translat-attr label {
154+
padding-left: 20px;
155+
display: inline-block;
156+
background: url("../images/icons/locale.png") no-repeat left center;
157+
}

0 commit comments

Comments
 (0)