Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Jun 14, 2016 · 86a9f35 · 86a9f35
2 parents 85b2b6a + b30f509
commit 86a9f35
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/templates/news_paper/config.xml b/templates/news_paper/config.xml
@@ -31,6 +31,7 @@
             <filename>css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css</filename>
             <filename>css/news_paper.css</filename>
             <filename>css/template.css</filename>
+            <filename>css/template-news-paper.css</filename>
         </css>
         <js>
             <filename>scripts/template.js</filename>

diff --git a/templates/news_paper/css/template-news-paper.css b/templates/news_paper/css/template-news-paper.css
@@ -0,0 +1,23 @@
+/**
+ * Specific configuration for New Paper template
+ *
+ * It's the very last file to be loaded.
+ * N.B for internal team: this file will not be RTL. Any defintion specific to left/right positionning should be placed on template.css
+ */
+
+ .answer-container,.question-help-container {
+     border: none;
+ }
+
+ .radio label::after {
+   background-color: #3a87ad;
+ }
+
+
+ .checkbox label::after {
+   color: #3a87ad;
+ }
+
+.question-text{
+    color: #777777;
+}
diff --git a/templates/ubuntu_orange/config.xml b/templates/ubuntu_orange/config.xml
@@ -24,6 +24,7 @@
             <filename>css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css</filename>
             <filename>css/ubuntu_orange.css</filename>
             <filename>css/template.css</filename>
+            <filename>css/template-ubuntu-orange.css</filename>
         </css>
         <js>
             <filename>scripts/template.js</filename>

diff --git a/templates/ubuntu_orange/css/template-ubuntu-orange.css b/templates/ubuntu_orange/css/template-ubuntu-orange.css
@@ -0,0 +1,24 @@
+/**
+ * Specific configuration for Ubuntu Orange template
+ *
+ * It's the very last file to be loaded.
+ * N.B for internal team: this file will not be RTL. Any defintion specific to left/right positionning should be placed on template.css
+ */
+
+ .answer-container,.question-help-container {
+     border: none;
+ }
+
+ .radio label::after {
+   background-color: #dd4814;
+ }
+
+
+ .checkbox label::after {
+   color: #dd4814;
+ }
+
+.question-text{
+    color: #333333;
+    font-size: 18px;
+}