Merge pull request #99 from OS2Forms/develop

Develop

web/themes/custom/custom_theme/src/styles/_fonts.scss

@@ -103,3 +103,71 @@ h1, h2, h3, h4, h5, h6, p, legend, strong, b, cite, var, address, dfn {
   -moz-font-feature-settings: "kern";
   -moz-font-feature-settings: "kern=1";
 }
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-Medium.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-Medium.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-Medium.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-Medium.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-Medium.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-Bold.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-Bold.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-Bold.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-Bold.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-Bold.ttf') format('truetype');
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-BoldItalic.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-BoldItalic.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-BoldItalic.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-BoldItalic.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-BoldItalic.ttf') format('truetype');
+  font-weight: 700;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-MediumItalic.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-MediumItalic.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-MediumItalic.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-MediumItalic.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-MediumItalic.ttf') format('truetype');
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-Light.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-Light.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-Light.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-Light.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-Light.ttf') format('truetype');
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Riona Sans';
+  src: url('../fonts/RionaSans/RionaSansW04-LightItalic.eot');
+  src: url('../fonts/RionaSans/RionaSansW04-LightItalic.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/RionaSans/RionaSansW04-LightItalic.woff2') format('woff2'),
+  url('../fonts/RionaSans/RionaSansW04-LightItalic.woff') format('woff'),
+  url('../fonts/RionaSans/RionaSansW04-LightItalic.ttf') format('truetype');
+  font-weight: 300;
+  font-style: italic;
+}
+
+

web/themes/custom/white_darkblue/css/overrides-webform.css

@@ -1,14 +1,9 @@
 .webform-scale-option .form-item label {
-  width: 36px;
-  height: 36px;
   margin: 0;
   text-align: center;
   color: #666;
   border: 3px solid #ccc;
-  border-radius: 50%;
   background-color: #fff;
-  font-size: 1.2em;
-  line-height: 36px;
   padding: 0;
 }
 
@@ -22,3 +17,37 @@
   color: #000 !important;
 }
 
+.webform-scale-medium .form-item label {
+  width: 36px;
+  height: 36px;
+  font-size: 1.2em;
+  line-height: 36px;
+}
+
+.webform-scale-circle .form-item label {
+  border-radius: 50%;
+}
+
+.webform-scale-small .form-item label {
+  width: 24px;
+  height: 24px;
+  font-size: 1.1em;
+  line-height: 24px;
+  border-width: 2px;
+}
+
+.webform-scale-large .form-item label {
+  width: 48px;
+  height: 48px;
+  font-size: 1.5em;
+  line-height: 48px;
+}
+
+.webform-scale-square .form-item label {
+  border-radius: 3px;
+}
+
+.webform-scale-flexbox .form-item label {
+  width: 100% !important;
+  border-radius: 3px;
+}