optimacms 0.2.18 → 0.2.19

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,68 @@
1
+ //== Colors
2
+
3
+ $col-blue-1: #1e6887;
4
+ $col-blue-2: #2679b5;
5
+ $col-blue-3: #438eb9;
6
+ $col-blue-4: #8089a0;
7
+
8
+
9
+ $col-blue-dark: #3b73b1;
10
+ $col-blue-darker: #205081;
11
+ $col-blue-light: #3879bb;
12
+ $col-blue-lighter: #4c9ac9;
13
+ $col-blue-lightest: #59afe1;
14
+ $col-blue-medium: #009ac4;
15
+
16
+
17
+ $col-green-lighter: #5fb611;
18
+ $col-green-light: #67ab49;
19
+ $col-green-med: #72c02c;
20
+ $col-green-dark: #7ca60a;
21
+ $col-green-darker: #51873a;
22
+
23
+
24
+
25
+ $gray-darker: lighten(#000, 13.5%); // #222
26
+ $gray-dark: #7b8a8b; // #333
27
+ $gray: #95a5a6; // #555
28
+ $gray-light: #b4bcc2; // #999
29
+ $gray-lighter: #ecf0f1; // #eee
30
+
31
+ $gray-light-light: #f5f5f5;
32
+
33
+ /*
34
+ $gray-darker: lighten(#000, 13.5%); // #222
35
+ $gray-dark: #333;
36
+ $gray: #555;
37
+ $gray-light: #999;
38
+ $gray-lighter: #eee;
39
+ $gray-light-medium: #a6a6a6;
40
+ */
41
+
42
+
43
+
44
+ /* main colors */
45
+ $col-blue: $col-blue-light;
46
+ $col-green: $col-green-lighter;
47
+
48
+
49
+
50
+ //## Gray and brand colors for use across Bootstrap.
51
+ $col-primary: $col-blue;
52
+ $col-second: $col-green;
53
+
54
+ $brand-primary: $col-second;
55
+ $brand-success: $col-primary;
56
+
57
+ $brand-info: $col-primary;
58
+ $brand-warning: #F39C12;
59
+ $brand-danger: #E74C3C;
60
+
61
+
62
+ //
63
+
64
+ $col-light-bg: #f5f5f5;
65
+ $col-sel-bg: $col-blue;
66
+ $col-bg-light: #d3d6db;
67
+
68
+ $col-font-blue-dark: #384f59;
@@ -0,0 +1,95 @@
1
+
2
+ .no-skin {
3
+ .sidebar {
4
+ background-color: #f2f2f2;
5
+ border-color: #cccccc;
6
+ border-style: solid;
7
+ border-width: 0 1px 0 0;
8
+ }
9
+ }
10
+
11
+
12
+
13
+ /* nav-list */
14
+
15
+ /*
16
+ $navlist-col-bg: #ececec;
17
+ $navlist-col-bg-active: #dfdfdf;
18
+ $navlist-col-bg-hover: #f1f1f1;
19
+
20
+ $navlist-font-size: 13px;
21
+ $navlist-font-col: #555555;
22
+ $navlist-font-col-active: #266cad;
23
+
24
+ $navlist-border-col: #dfdfdf;
25
+ */
26
+
27
+
28
+ $navlist-col-bg: #f5f7fa;
29
+ $navlist-col-bg-active: #f5f7fa;
30
+ $navlist-col-bg-hover: #f5f7fa;
31
+
32
+ $navlist-col-bg-submenu: #ffffff;
33
+ $navlist-col-bg-submenu-active: #ffffff;
34
+ $navlist-col-bg-submenu-hover: #f5f7fa;
35
+
36
+ $navlist-font-size: 13px;
37
+ $navlist-font-col: #555555;
38
+ $navlist-font-col-active: #266cad;
39
+
40
+ $navlist-border-col: #e4e4e4;
41
+
42
+
43
+
44
+
45
+ .no-skin{
46
+
47
+ #sidebar-wrapper{
48
+ background-color: #f5f5f5;
49
+ border-right: 1px #cccccc solid;
50
+ }
51
+
52
+ .nav-list{
53
+ font-size: $navlist-font-size;
54
+
55
+ > li {
56
+ a {
57
+ background-color: $navlist-col-bg;
58
+ color: $navlist-font-col;
59
+
60
+ &:hover {
61
+ background-color: $navlist-col-bg-hover;
62
+ }
63
+ }
64
+ }
65
+
66
+ > li.active {
67
+ > a {
68
+ background-color: $navlist-col-bg-active;
69
+ font-weight: 700;
70
+ }
71
+ }
72
+
73
+ .submenu {
74
+ li{
75
+ a{
76
+ background-color: $navlist-col-bg-submenu;
77
+
78
+ &:hover{
79
+ background-color: $navlist-col-bg-hover;
80
+ }
81
+ }
82
+ }
83
+
84
+ li.active {
85
+ a {
86
+ background-color: $navlist-col-bg-submenu-active;
87
+ font-weight: 700;
88
+ }
89
+ }
90
+
91
+ }
92
+
93
+ }
94
+
95
+ }
@@ -0,0 +1,55 @@
1
+ pre {
2
+ font-family: consolas, monospace;
3
+ font-weight: normal;
4
+ color: #069;
5
+ border-top: 1px dotted #a9a9a9;
6
+ border-bottom: 4px solid #ededed;
7
+ border-left: 3px solid #6CE26C;
8
+ margin-left: 10px;
9
+ padding: 3px 0px 5px 7px ;
10
+ }
11
+
12
+ code {
13
+ font-family: consolas, monospace;
14
+ font-weight: bold;
15
+ color: #069;
16
+ }
17
+
18
+ code a {
19
+ font-family: consolas, monospace;
20
+ font-size: 100%;
21
+ font-weight: bold;
22
+ color: #069;
23
+ text-decoration: underline;
24
+ }
25
+
26
+ a > code {
27
+ font-family: consolas, monospace;
28
+ font-size: 100%;
29
+ font-weight: bold;
30
+ color: #069;
31
+ text-decoration: underline;
32
+ }
33
+
34
+ ul {
35
+ list-style-type: disc;
36
+ padding-left: 14px;
37
+ margin-top: 3px;
38
+ margin-bottom: 7px;
39
+ }
40
+
41
+ ul > li {
42
+ margin-bottom: 4px;
43
+ }
44
+
45
+
46
+ ol {
47
+ list-style-type: decimal;
48
+ padding-left: 14px;
49
+ margin-top: 3px;
50
+ margin-bottom: 7px;
51
+ }
52
+
53
+ ol > li {
54
+ margin-bottom: 4px;
55
+ }
@@ -0,0 +1,309 @@
1
+
2
+ /* html */
3
+ html,
4
+ body {
5
+ height: 100%;
6
+ }
7
+
8
+ /* Wrapper for page content to push down footer */
9
+ #wrapper {
10
+ min-height: 100%;
11
+ height: auto !important;
12
+ height: 100%;
13
+
14
+ /* Negative indent footer by its height */
15
+ margin: 0 auto 20px;
16
+ /* Pad bottom by footer height */
17
+ padding: 0 0 0px;
18
+ }
19
+
20
+
21
+
22
+
23
+ /* main layout */
24
+ #topbar{
25
+ background-color: $col-blue-1;
26
+
27
+ a{
28
+ color: #ffffff;
29
+ }
30
+
31
+ ul.nav{
32
+ a{
33
+ color: $gray;
34
+ }
35
+ }
36
+ }
37
+
38
+
39
+ // solution 1
40
+
41
+ .main-container:before {
42
+ background-color: #ffffff;
43
+ bottom: 0;
44
+ content: "";
45
+ display: block;
46
+ max-width: inherit;
47
+ position: absolute;
48
+ top: 0;
49
+ width: 100%;
50
+ z-index: -2;
51
+ }
52
+
53
+
54
+ .main-content:before, .main-content:after {
55
+ content: " ";
56
+ display: table;
57
+ }
58
+ .main-content:after {
59
+ clear: both;
60
+ }
61
+ .main-content:before, .main-content:after {
62
+ content: " ";
63
+ display: table;
64
+ }
65
+
66
+ .main-content {
67
+ min-height: 100%;
68
+ padding: 0;
69
+ }
70
+
71
+
72
+ .main-content-inner {
73
+ float: left;
74
+ width: 100%;
75
+ }
76
+
77
+ .sidebar {
78
+ float: left;
79
+ padding-left: 0;
80
+ padding-right: 0;
81
+ position: static;
82
+ width: 240px;
83
+ min-height1:600px;
84
+ }
85
+
86
+
87
+ .sidebar:before {
88
+ background-color: inherit;
89
+ border-color: inherit;
90
+ border-style: inherit;
91
+ border-width: inherit;
92
+ bottom: 0;
93
+ content: "";
94
+ display: block;
95
+ position: absolute;
96
+ top: 0;
97
+ width: inherit;
98
+ z-index: -1;
99
+ }
100
+
101
+ .sidebar + .main-content {
102
+ margin-left: 240px;
103
+ }
104
+
105
+
106
+
107
+ .page-content {
108
+ background-color: #ffffff;
109
+ margin: 0;
110
+ position: relative;
111
+ }
112
+
113
+
114
+ .page-content{
115
+ padding: 0px 14px 20px 24px;
116
+ }
117
+
118
+
119
+
120
+ /* Set the fixed height of the footer here */
121
+ #footer {
122
+ min-height: 60px;
123
+ background: none repeat scroll 0 0 #272727;
124
+ padding: 40px 0;
125
+ color: #dedede;
126
+
127
+ a {
128
+ margin: 0 2px;
129
+ font-size:13px;
130
+ color: $gray-light;
131
+ text-decoration: underline;
132
+
133
+ &:hover{
134
+ color:$gray-lighter;
135
+ }
136
+ }
137
+
138
+
139
+ .t{
140
+ color: #ffffff;
141
+ }
142
+
143
+ #footer-socials {
144
+ margin-top: 12px;
145
+ text-align: left;
146
+
147
+ li a {
148
+ color: #777777;
149
+ font-size: 17px;
150
+ }
151
+
152
+ }
153
+
154
+ }
155
+
156
+
157
+ /* common */
158
+
159
+ .clear{
160
+ clear:both;
161
+ }
162
+
163
+ .pad20{
164
+ padding:20px;
165
+ }
166
+
167
+
168
+ /* nav list */
169
+
170
+ ul.nav-list{
171
+ list-style-type: none;
172
+ padding-left: 0;
173
+
174
+ font-size: 13px;
175
+
176
+
177
+ > li {
178
+ a {
179
+ background-color: #ececec;
180
+ border-top: 1px solid #dfdfdf;
181
+ color: #555555;
182
+ display: block;
183
+ padding: 10px 0 10px 15px;
184
+ position: relative;
185
+
186
+ &:hover {
187
+ background-color: #f1f1f1;
188
+ text-decoration: none;
189
+ }
190
+
191
+ > .arrow {
192
+ display: block;
193
+ font-size: 18px;
194
+ height: 14px;
195
+ line-height: 14px;
196
+ padding: 0;
197
+ position: absolute;
198
+ right: 10px;
199
+ text-align: center;
200
+ text-shadow: none;
201
+ top: 12px;
202
+ width: 14px !important;
203
+ }
204
+
205
+ }
206
+
207
+ a[aria-expanded="false"]{
208
+ > .arrow{
209
+ &.for-expanded{
210
+ display:none;
211
+ }
212
+ &.for-collapsed{
213
+ display:block;
214
+ }
215
+ }
216
+ }
217
+
218
+ a[aria-expanded="true"]{
219
+ > .arrow{
220
+ &.for-expanded{
221
+ display:block;
222
+ }
223
+ &.for-collapsed{
224
+ display:none;
225
+ }
226
+ }
227
+ }
228
+
229
+ }
230
+
231
+ > li.active {
232
+ > a {
233
+ background-color: #dfdfdf;
234
+ font-weight: 700;
235
+ }
236
+ }
237
+
238
+ > li:first-child{
239
+ > a {
240
+ border-top: medium none;
241
+ }
242
+ }
243
+
244
+ .submenu {
245
+ padding-left: 0;
246
+ position: relative;
247
+
248
+ li{
249
+ a {
250
+ padding-left: 19px;
251
+ }
252
+ }
253
+
254
+ li.active {
255
+ a {
256
+ font-weight: 700;
257
+ }
258
+ }
259
+
260
+ }
261
+
262
+ }
263
+
264
+
265
+
266
+ /* page-header */
267
+
268
+ .page-header{
269
+ margin-top: 12px;
270
+ margin-bottom: 12px;
271
+
272
+ border-bottom: 1px solid #e2e2e2;
273
+
274
+ h1{
275
+ margin: 0 8px 0px 0px;
276
+ color: $col-blue-2;
277
+ font-size: 24px;
278
+ font-weight: lighter;
279
+ padding: 0;
280
+
281
+ small {
282
+ color: $col-blue-4;
283
+ font-size: 14px;
284
+ font-weight: 400;
285
+ margin: 0 6px;
286
+ }
287
+ }
288
+ }
289
+
290
+
291
+ /* breadcrumbs */
292
+
293
+ div.breadcrumbs{
294
+ background-color: $gray-light-light;
295
+ border-bottom: 1px solid #e5e5e5;
296
+ line-height: 30px;
297
+ min-height: 35px;
298
+ padding: 4px 0px 4px 0;
299
+ position: relative;
300
+ z-index: auto;
301
+ font-size: 13px;
302
+
303
+ ul.breadcrumb{
304
+ margin-bottom:0px;
305
+ }
306
+ }
307
+
308
+
309
+
@@ -1,3 +1,3 @@
1
1
  module Optimacms
2
- VERSION = "0.2.18"
2
+ VERSION = "0.2.19"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: optimacms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.18
4
+ version: 0.2.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Max Ivak
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-05 00:00:00.000000000 Z
11
+ date: 2016-10-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -305,6 +305,14 @@ files:
305
305
  - app/assets/javascripts/optimacms/admin.js
306
306
  - app/assets/javascripts/optimacms/application.js
307
307
  - app/assets/stylesheets/optimacms/admin.scss
308
+ - app/assets/stylesheets/optimacms/admin_tpl.scss
309
+ - app/assets/stylesheets/optimacms/bootstrap_and_overrides.scss
310
+ - app/assets/stylesheets/optimacms/bootstrap_custom.scss
311
+ - app/assets/stylesheets/optimacms/bootstrap_variables.scss
312
+ - app/assets/stylesheets/optimacms/colors.scss
313
+ - app/assets/stylesheets/optimacms/skins/noskin.scss
314
+ - app/assets/stylesheets/optimacms/tinymce.scss
315
+ - app/assets/stylesheets/optimacms/tpl.scss
308
316
  - app/controllers/optimacms/admin/admin_base_controller.rb
309
317
  - app/controllers/optimacms/admin/app_sys_controller.rb
310
318
  - app/controllers/optimacms/admin/common_controller.rb