Dev: renamed styling.css to template.css

And reconfigured config.xml
LimeSurvey · Oct 27, 2016 · f07ccf0 · f07ccf0
1 parent 8b2b74a
commit f07ccf0
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 290 deletions.
diff --git a/templates/default/config.xml b/templates/default/config.xml
@@ -31,7 +31,7 @@
       <filename>css/bootstrap-slider.css</filename>
       <filename>css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css</filename>
       <filename>css/ls-functional.css</filename>
-      <filename>css/styling.css</filename>
+      <filename>css/template.css</filename>
     </css>
     <js>
       <filename>scripts/template.js</filename>
@@ -78,8 +78,8 @@
     -->
   <files_editable>
     <css>
-      <filename>css/flat_and_modern.css</filename>
       <filename>css/template.css</filename>
+      <filename>css/ls-functional.css</filename>
     </css>
     <js>
       <filename>scripts/template.js</filename>

diff --git a/templates/default/css/ls-functional.css b/templates/default/css/ls-functional.css
@@ -1,14 +1,3 @@
-.form-horizontal .control-label {
-  text-align: left;
-  font-weight: normal; }
-
-.ls-language-changer-item {
-  text-align: center; }
-
-.ls-timer-content.alert {
-  margin-top: 15px;
-  margin-bottom: 0; }
-
 .ls-label-xs-visibility,
 div.question-help:empty,
 #indexcontainer,
@@ -19,11 +8,6 @@ div.question-help:empty,
   .ls-label-xs-visibility {
     display: normal; } }
 
-ul.ls-answers,
-.ls-answers .form-group:last-child,
-.ls-answers table {
-  margin-bottom: 0; }
-
 .checkbox, .radio {
   display: table-cell; }
 

diff --git a/templates/default/css/style.css b/templates/default/css/style.css
diff --git a/templates/default/css/styling.css b/templates/default/css/styling.css