diff --git a/application/views/layouts/installer.php b/application/views/layouts/installer.php index d8a7f436acb..34e3f10b483 100644 --- a/application/views/layouts/installer.php +++ b/application/views/layouts/installer.php @@ -9,9 +9,13 @@ getClientScript()->registerPackage('bootstrap'); + App()->getClientScript()->registerPackage('bootstrap-switch'); + App()->getClientScript()->registerPackage('jquery'); App()->getClientScript()->registerPackage('jqueryui'); - App()->bootstrap->register(); + App()->getClientScript()->registerPackage('adminbasics'); App()->getClientScript()->registerPackage('fontawesome'); + App()->getClientScript()->registerPackage('font-roboto'); App()->getClientScript()->registerCssFile( Yii::app()->getConfig('styleurl') . 'Sea_Green/css/lime-admin-colors.css'); App()->getClientScript()->registerCssFile( Yii::app()->getConfig('styleurl') . 'Sea_Green/css/lime-admin-common.css'); @@ -36,13 +40,15 @@
-
-

-
+
+
+

+
+
-
+
Powered by LimeSurvey
diff --git a/installer/create-database.php b/installer/create-database.php index b7a5a6fa204..dc42f6b55c8 100644 --- a/installer/create-database.php +++ b/installer/create-database.php @@ -530,7 +530,7 @@ function createDatabase($oDB){ [2,NULL,14,'responses','Responses','Responses','Responses','icon-browse','iconclass','','admin/responses/sa/browse/','','','','','responses','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0], [2,NULL,15,'statistics','Statistics','Statistics','Statistics','bar-chart','fontawesome','','admin/statistics/sa/index/','','','','','statistics','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0], [2,NULL,16,'reorder','Reorder questions/question groups','Reorder questions/question groups','Reorder questions/question groups','icon-organize','iconclass','','admin/survey/sa/organize/','','','','','surveycontent','update','{"render": {"isActive": false, "link": {"data": {"surveyid": ["survey","sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0], - [3,NULL,16,'plugins','Simple plugin settings', 'Simple plugins', 'Edit simple plugin settings','plug','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_plugins_panel','','surveysettings','read','{"render": {"link": {"data": {"surveyid": ["survey","sid"]}}}}','','_pluginTabSurvey','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0], + [3,NULL,16,'plugins','Simple plugin settings', 'Simple plugins', 'Edit simple plugin settings','plug','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_plugins_panel','','surveysettings','read','{"render": {"link": {"data": {"surveyid": ["survey","sid"]}}}}','_pluginTabSurvey','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0], ]; foreach($basicMenues as $basicMenu){ diff --git a/installer/css/fonts.css b/installer/css/fonts.css index 8b0c651d051..99133a5118a 100644 --- a/installer/css/fonts.css +++ b/installer/css/fonts.css @@ -1,181 +1,4 @@ -@font-face { - font-family: 'Roboto'; - font-weight: 100; - font-style: normal; - src: url('../../../assets/fonts/Roboto-100/Roboto-100.eot'); - src: url('../../../assets/fonts/Roboto-100/Roboto-100.eot?#iefix') format('embedded-opentype'), - local('Roboto Thin'), - local('Roboto-100'), - url('../../../assets/fonts/Roboto-100/Roboto-100.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-100/Roboto-100.woff') format('woff'), - url('../../../assets/fonts/Roboto-100/Roboto-100.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-100/Roboto-100.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 300; - font-style: normal; - src: url('../../../assets/fonts/Roboto-300/Roboto-300.eot'); - src: url('../../../assets/fonts/Roboto-300/Roboto-300.eot?#iefix') format('embedded-opentype'), - local('Roboto Light'), - local('Roboto-300'), - url('../../../assets/fonts/Roboto-300/Roboto-300.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-300/Roboto-300.woff') format('woff'), - url('../../../assets/fonts/Roboto-300/Roboto-300.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-300/Roboto-300.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 400; - font-style: normal; - src: url('../../../assets/fonts/Roboto-regular/Roboto-regular.eot'); - src: url('../../../assets/fonts/Roboto-regular/Roboto-regular.eot?#iefix') format('embedded-opentype'), - local('Roboto'), - local('Roboto-regular'), - url('../../../assets/fonts/Roboto-regular/Roboto-regular.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-regular/Roboto-regular.woff') format('woff'), - url('../../../assets/fonts/Roboto-regular/Roboto-regular.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-regular/Roboto-regular.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 500; - font-style: normal; - src: url('../../../assets/fonts/Roboto-500/Roboto-500.eot'); - src: url('../../../assets/fonts/Roboto-500/Roboto-500.eot?#iefix') format('embedded-opentype'), - local('Roboto Medium'), - local('Roboto-500'), - url('../../../assets/fonts/Roboto-500/Roboto-500.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-500/Roboto-500.woff') format('woff'), - url('../../../assets/fonts/Roboto-500/Roboto-500.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-500/Roboto-500.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 700; - font-style: normal; - src: url('../../../assets/fonts/Roboto-700/Roboto-700.eot'); - src: url('../../../assets/fonts/Roboto-700/Roboto-700.eot?#iefix') format('embedded-opentype'), - local('Roboto Bold'), - local('Roboto-700'), - url('../../../assets/fonts/Roboto-700/Roboto-700.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-700/Roboto-700.woff') format('woff'), - url('../../../assets/fonts/Roboto-700/Roboto-700.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-700/Roboto-700.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 900; - font-style: normal; - src: url('../../../assets/fonts/Roboto-900/Roboto-900.eot'); - src: url('../../../assets/fonts/Roboto-900/Roboto-900.eot?#iefix') format('embedded-opentype'), - local('Roboto Black'), - local('Roboto-900'), - url('../../../assets/fonts/Roboto-900/Roboto-900.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-900/Roboto-900.woff') format('woff'), - url('../../../assets/fonts/Roboto-900/Roboto-900.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-900/Roboto-900.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 100; - font-style: italic; - src: url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.eot'); - src: url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Thin Italic'), - local('Roboto-100italic'), - url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-100italic/Roboto-100italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 300; - font-style: italic; - src: url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.eot'); - src: url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Light Italic'), - local('Roboto-300italic'), - url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-300italic/Roboto-300italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 400; - font-style: italic; - src: url('../../../assets/fonts/Roboto-italic/Roboto-italic.eot'); - src: url('../../../assets/fonts/Roboto-italic/Roboto-italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Italic'), - local('Roboto-italic'), - url('../../../assets/fonts/Roboto-italic/Roboto-italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-italic/Roboto-italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-italic/Roboto-italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-italic/Roboto-italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 500; - font-style: italic; - src: url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.eot'); - src: url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Medium Italic'), - local('Roboto-500italic'), - url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-500italic/Roboto-500italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 700; - font-style: italic; - src: url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.eot'); - src: url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Bold Italic'), - local('Roboto-700italic'), - url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-700italic/Roboto-700italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'Roboto'; - font-weight: 900; - font-style: italic; - src: url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.eot'); - src: url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.eot?#iefix') format('embedded-opentype'), - local('Roboto Black Italic'), - local('Roboto-900italic'), - url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.woff2') format('woff2'), - url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.woff') format('woff'), - url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.ttf') format('truetype'), - url('../../../assets/fonts/Roboto-900italic/Roboto-900italic.svg#Roboto') format('svg'); -} - -@font-face { - font-family: 'icomoon'; - src:url('../../../assets/fonts/icomoon.eot?wnghtv'); - src:url('../../../assets/fonts/icomoon.eot?wnghtv#iefix') format('embedded-opentype'), - url('../../../assets/fonts/icomoon.ttf?wnghtv') format('truetype'), - url('../../../assets/fonts/icomoon.woff?wnghtv') format('woff'), - url('../../../assets/fonts/icomoon.svg?wnghtv#icomoon') format('svg'); - font-weight: normal; - font-style: normal; -} + [class^="icon-"], [class*=" icon-"] { font-family: 'icomoon'; diff --git a/installer/css/main.css b/installer/css/main.css index b54c16affd5..97eacb0db6a 100644 --- a/installer/css/main.css +++ b/installer/css/main.css @@ -85,7 +85,7 @@ div.messagebox .header{ } h1 { - font-size: 16px; + font-size: 36px; } h2 { color: #328637;