Skip to content
This repository was archived by the owner on Jun 25, 2022. It is now read-only.

Commit dd2e12f

Browse files
giovdk21giovdk21
committed
Added Bootstrap, ui and small improvements
ui still needs cleaning up
1 parent 172a842 commit dd2e12f

File tree

114 files changed

+13460
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+13460
-249
lines changed

‎.gitignore

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
assets/
2-
protected/runtime/
3-
themes/classic/views/
1+
assets/
2+
protected/runtime/*
3+
themes/classic/views/
4+
/index.php
5+
.idea/
6+
protected/data/user.db

‎css/form.css

+19-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
div.form
3838
{
39-
margin: 0;
4039
}
4140

4241
div.form input,
@@ -83,12 +82,16 @@ div.form span.required
8382
color: red;
8483
}
8584

85+
div.form div.error label:first-child,
8686
div.form label.error,
8787
div.form span.error
8888
{
8989
color: #C00;
9090
}
9191

92+
div.form div.error input,
93+
div.form div.error textarea,
94+
div.form div.error select,
9295
div.form input.error,
9396
div.form textarea.error,
9497
div.form select.error
@@ -97,6 +100,18 @@ div.form select.error
97100
border-color: #C00;
98101
}
99102

103+
div.form div.success input,
104+
div.form div.success textarea,
105+
div.form div.success select,
106+
div.form input.success,
107+
div.form textarea.success,
108+
div.form select.success
109+
{
110+
background: #E6EFC2;
111+
border-color: #C6D880;
112+
}
113+
114+
100115
div.form .errorSummary
101116
{
102117
border: 2px solid #C00;
@@ -124,7 +139,7 @@ div.form .errorSummary ul
124139
padding: 0 0 0 20px;
125140
}
126141

127-
div.wide form label
142+
div.wide.form label
128143
{
129144
float: left;
130145
margin-right: 10px;
@@ -133,18 +148,13 @@ div.wide form label
133148
width: 100px;
134149
}
135150

136-
div.wide form .row
151+
div.wide.form .row
137152
{
138153
clear: left;
139154
}
140155

141-
div.wide form .buttons
156+
div.wide.form .buttons, div.wide.form .hint, div.wide.form .errorMessage
142157
{
143158
clear: left;
144159
padding-left: 110px;
145160
}
146-
147-
div.wide form .errorMessage
148-
{
149-
margin: 0 0 0 110px;
150-
}

‎css/ie.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -----------------------------------------------------------------------
22
33
4-
Blueprint CSS Framework 0.9
4+
Blueprint CSS Framework 1.0.1
55
http://blueprintcss.org
66
77
* Copyright (c) 2007-Present. See LICENSE for more info.
@@ -14,7 +14,7 @@
1414
/* ie.css */
1515
body {text-align:center;}
1616
.container {text-align:left;}
17-
* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {display:inline;overflow-x:hidden;}
17+
* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
1818
* html legend {margin:0px -8px 16px 0;padding:0;}
1919
sup {vertical-align:text-top;}
2020
sub {vertical-align:text-bottom;}
@@ -24,12 +24,13 @@ img {-ms-interpolation-mode:bicubic;}
2424
.clearfix, .container {display:inline-block;}
2525
* html .clearfix, * html .container {height:1%;}
2626
fieldset {padding-top:0;}
27+
legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
2728
textarea {overflow:auto;}
29+
label {vertical-align:middle;position:relative;top:-0.25em;}
2830
input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
2931
input.text:focus, input.title:focus {border-color:#666;}
3032
input.text, input.title, textarea, select {margin:0.5em 0;}
3133
input.checkbox, input.radio {position:relative;top:.25em;}
3234
form.inline div, form.inline p {vertical-align:middle;}
33-
form.inline label {position:relative;top:-0.25em;}
3435
form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
3536
button, input.button {position:relative;top:0.25em;}

‎css/main.css

+92-38
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ body
2727
padding: 20px;
2828
}
2929

30+
#sidebar
31+
{
32+
padding: 20px 20px 20px 0;
33+
}
34+
3035
#footer
3136
{
3237
padding: 10px;
@@ -49,8 +54,7 @@ body
4954

5055
#mainmenu ul
5156
{
52-
/* padding:6px 20px 5px 20px; */
53-
xpadding: 0px;
57+
padding:6px 20px 5px 20px;
5458
margin:0px;
5559
}
5660

@@ -66,56 +70,55 @@ body
6670
font-size:12px;
6771
font-weight:bold;
6872
text-decoration:none;
69-
padding:0px 8px;
73+
padding:5px 8px;
7074
}
7175

72-
#mainmenu ul li a:hover, #mainmenu ul li a.active
76+
#mainmenu ul li a:hover, #mainmenu ul li.active a
7377
{
74-
/* color: #6399cd;
75-
background-color:#EFF4FA; */
76-
color: #FA0;
78+
color: #6399cd;
79+
background-color:#EFF4FA;
7780
text-decoration:none;
7881
}
7982

80-
div.error, div.notice, .success
83+
div.flash-error, div.flash-notice, div.flash-success
8184
{
8285
padding:.8em;
8386
margin-bottom:1em;
8487
border:2px solid #ddd;
8588
}
8689

87-
div.error
90+
div.flash-error
8891
{
8992
background:#FBE3E4;
9093
color:#8a1f11;
9194
border-color:#FBC2C4;
9295
}
9396

94-
div.notice
97+
div.flash-notice
9598
{
9699
background:#FFF6BF;
97100
color:#514721;
98101
border-color:#FFD324;
99102
}
100103

101-
div.success
104+
div.flash-success
102105
{
103106
background:#E6EFC2;
104107
color:#264409;
105108
border-color:#C6D880;
106109
}
107110

108-
div.error a
111+
div.flash-error a
109112
{
110113
color:#8a1f11;
111114
}
112115

113-
div.notice a
116+
div.flash-notice a
114117
{
115118
color:#514721;
116119
}
117120

118-
div.success a
121+
div.flash-success a
119122
{
120123
color:#264409;
121124
}
@@ -125,51 +128,102 @@ div.form .rememberMe label
125128
display: inline;
126129
}
127130

128-
.actions
131+
div.view
132+
{
133+
padding: 10px;
134+
margin: 10px 0;
135+
border: 1px solid #C9E0ED;
136+
}
137+
138+
div.breadcrumbs
139+
{
140+
font-size: 0.9em;
141+
padding: 5px 20px;
142+
}
143+
144+
div.breadcrumbs span
145+
{
146+
font-weight: bold;
147+
}
148+
149+
div.search-form
150+
{
151+
padding: 10px;
152+
margin: 10px 0;
153+
background: #eee;
154+
}
155+
156+
.portlet
157+
{
158+
159+
}
160+
161+
.portlet-decoration
162+
{
163+
padding: 3px 8px;
164+
background: #B7D6E7;
165+
border-left: 5px solid #6FACCF;
166+
}
167+
168+
.portlet-title
129169
{
130-
margin: 0 0 10px 0;
170+
font-size: 12px;
171+
font-weight: bold;
131172
padding: 0;
173+
margin: 0;
174+
color: #298dcd;
132175
}
133176

134-
.actions li
177+
.portlet-content
135178
{
136-
display: inline;
179+
font-size:0.9em;
180+
margin: 0 0 15px 0;
181+
padding: 5px 8px;
182+
background:#EFFDFF;
183+
}
184+
185+
.portlet-content ul
186+
{
187+
list-style-image:none;
188+
list-style-position:outside;
189+
list-style-type:none;
137190
margin: 0;
138191
padding: 0;
139192
}
140193

141-
.actions li a
194+
.portlet-content li
142195
{
143-
padding: 5px;
196+
padding: 2px 0 4px 0px;
197+
}
198+
199+
.operations
200+
{
201+
list-style-type: none;
144202
margin: 0;
145-
color: #298dcd;
146-
text-decoration: none;
147-
font-size: 0.8em;
148-
font-weight: bold;
149-
background: #DFF4FF;
150-
border-left: 5px solid #589FC8;
203+
padding: 0;
151204
}
152205

153-
.actions li a:hover, .actions li a.active
206+
.operations li
154207
{
155-
background: #589FC8;
156-
color: white;
208+
padding-bottom: 2px;
157209
}
158210

159-
div.view
211+
.operations li a
160212
{
161-
padding: 10px;
162-
margin: 10px 0;
163-
border: 1px solid #C9E0ED;
213+
font: bold 12px Arial;
214+
color: #0066A4;
215+
display: block;
216+
padding: 2px 0 2px 8px;
217+
line-height: 15px;
218+
text-decoration: none;
164219
}
165220

166-
div.breadcrumbs
221+
.operations li a:visited
167222
{
168-
font-size: 0.9em;
169-
padding: 5px 20px;
223+
color: #0066A4;
170224
}
171225

172-
div.breadcrumbs span
226+
.operations li a:hover
173227
{
174-
font-weight: bold;
228+
background: #80CFFF;
175229
}

‎css/print.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -----------------------------------------------------------------------
22
33
4-
Blueprint CSS Framework 0.9
4+
Blueprint CSS Framework 1.0.1
55
http://blueprintcss.org
66
77
* Copyright (c) 2007-Present. See LICENSE for more info.

0 commit comments

Comments
 (0)