Skip to content

Commit 2f80851

Browse files
author
AJ Christensen
committed
Copy the frozen upstream files to make gems work correctly again.
1 parent 9ae39e8 commit 2f80851

17 files changed

Lines changed: 2608 additions & 9 deletions

File tree

chef-server-slice/public/images/add.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

chef-server-slice/public/images/delete.png

Lines changed: 0 additions & 1 deletion
This file was deleted.

chef-server-slice/public/javascripts/editor.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

chef-server-slice/public/javascripts/jquery.timers.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

chef-server-slice/public/javascripts/json2.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Submodule jsoneditor deleted from f00866f

chef-server-slice/public/stylesheets/base.css

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 336 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,336 @@
1+
* {margin:0;padding:0}
2+
.clear { clear: both; height: 0; }
3+
4+
h1 { margin: 15px 0; font-size: 22px; font-weight: normal; }
5+
h2 { font-size: 22px; margin: 15px 0; font-weight: normal;}
6+
h3 { font-size: 18px; margin: 10px 0; font-weight: normal;}
7+
h4 { font-size: 16px; margin: 10px 0; font-weight: normal;}
8+
hr {height: 1px; border: 0; }
9+
p { margin: 15px 0;}
10+
a img { border: none; }
11+
12+
body {
13+
font-size: 12px;
14+
font-family: sans-serif;
15+
}
16+
17+
#container {
18+
min-width: 960px;
19+
}
20+
21+
#header, #wrapper {
22+
padding: 0 20px;
23+
}
24+
25+
#header {
26+
position: relative;
27+
padding-top: 1px;
28+
}
29+
30+
#header h1 {
31+
margin: 0;
32+
padding: 10px 0;
33+
font-size: 30px;
34+
}
35+
36+
#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
37+
text-decoration: none;
38+
}
39+
40+
#main {
41+
width: 70%;
42+
float: left;
43+
}
44+
45+
.actions-bar {
46+
padding: 10px 1px;
47+
}
48+
49+
.actions-bar .actions {
50+
float: left;
51+
}
52+
53+
54+
.actions-bar .pagination {
55+
float: right;
56+
padding: 1px 0;
57+
}
58+
59+
#sidebar {
60+
width: 25%;
61+
float: right;
62+
}
63+
64+
#sidebar h3 {
65+
padding: 10px 15px;
66+
margin: 0;
67+
font-size: 13px;
68+
}
69+
70+
#sidebar .block {
71+
margin-bottom: 20px;
72+
padding-bottom: 10px;
73+
}
74+
75+
#sidebar .block .content {
76+
padding: 0 15px;
77+
}
78+
79+
#sidebar ul.navigation li a:link, #sidebar ul.navigation li a:visited {
80+
display: block;
81+
padding: 10px 15px;
82+
}
83+
84+
#sidebar .block .sidebar-block, #sidebar .notice {
85+
padding:10px;
86+
}
87+
88+
#wrapper {
89+
padding-top: 20px;
90+
}
91+
92+
#main .block {
93+
margin-bottom: 20px;
94+
padding-top: 1px;
95+
}
96+
97+
#main .block .content .inner {
98+
padding: 0 15px 15px;
99+
}
100+
101+
#main .main p.first {
102+
margin-top: 0;
103+
}
104+
105+
#user-navigation {
106+
position: absolute;
107+
top: 0px;
108+
right: 20px;
109+
}
110+
111+
#main-navigation {
112+
width: 100%;
113+
}
114+
115+
#user-navigation ul, #main-navigation ul, .secondary-navigation ul, #sidebar ul.navigation {
116+
margin: 0;
117+
padding: 0;
118+
list-style-type: none;
119+
}
120+
121+
#user-navigation ul li, #main-navigation ul li, .secondary-navigation ul li {
122+
float: left;
123+
}
124+
125+
#main-navigation ul li {
126+
margin-right: 5px;
127+
}
128+
129+
#user-navigation ul li {
130+
padding: 5px 10px;
131+
}
132+
133+
#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
134+
.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active,
135+
#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
136+
text-decoration: none;
137+
}
138+
139+
#main-navigation ul li a {
140+
font-size: 15px;
141+
display: block;
142+
padding: 8px 15px;
143+
}
144+
145+
.secondary-navigation {
146+
font-size: 13px;
147+
border-bottom-width: 10px;
148+
border-bottom-style: solid;
149+
}
150+
151+
.secondary-navigation ul li a {
152+
display: block;
153+
padding: 10px 15px;
154+
}
155+
156+
#footer {
157+
padding-bottom: 20px;
158+
}
159+
160+
/* pagination */
161+
162+
.pagination a, .pagination span {
163+
padding: 2px 5px;
164+
margin-right: 5px;
165+
display: block;
166+
float: left;
167+
border-style: solid;
168+
border-width: 1px;
169+
}
170+
171+
.pagination span.current {
172+
font-weight: bold;
173+
}
174+
175+
.pagination a {
176+
text-decoration: none;
177+
}
178+
179+
/* tables */
180+
.table {
181+
width: 100%;
182+
border-collapse: collapse;
183+
margin-bottom: 15px;
184+
}
185+
186+
.table th {
187+
padding: 10px;
188+
font-weight: bold;
189+
text-align: left;
190+
}
191+
192+
.table th.first {
193+
width: 30px;
194+
}
195+
196+
.table th.last {
197+
width: 200px;
198+
}
199+
200+
.table .checkbox {
201+
margin-left: 10px;
202+
}
203+
204+
.table td {
205+
padding: 10px;
206+
}
207+
208+
.table td.last {
209+
text-align: right;
210+
}
211+
212+
/* forms */
213+
214+
input.checkbox {
215+
margin: 0;
216+
padding: 0;
217+
}
218+
219+
.form .group {
220+
margin-bottom: 15px;
221+
}
222+
223+
.form div.left {
224+
width: 20%;
225+
float: left;
226+
}
227+
228+
.form div.right {
229+
width: 75%;
230+
float: right;
231+
}
232+
233+
.form .columns .column {
234+
width: 48%;
235+
}
236+
237+
.form .columns .left {
238+
float: left;
239+
}
240+
241+
.form .columns .right {
242+
float: right;
243+
}
244+
245+
.form label.label, .form input.text_field, .form textarea.text_area {
246+
font-size: 1.2em;
247+
padding: 1px 0;
248+
margin: 0;
249+
}
250+
251+
.form label.right {
252+
text-align: right;
253+
}
254+
255+
.form input.checkbox, .form input.radio {
256+
margin-right: 5px;
257+
}
258+
259+
.form label.checkbox, .form label.radio {
260+
line-height: 1.5em;
261+
}
262+
263+
.form label.label {
264+
display: block;
265+
padding-bottom: 2px;
266+
font-weight: bold;
267+
}
268+
269+
.form div.fieldWithErrors label.label {
270+
display: inline;
271+
}
272+
273+
.form .fieldWithErrors .error {
274+
color: red;
275+
}
276+
277+
.form input.text_field, .form textarea.text_area {
278+
width: 100%;
279+
border-width: 1px;
280+
border-style: solid;
281+
}
282+
283+
/* lists */
284+
285+
ul.list {
286+
margin: 0;
287+
padding: 0;
288+
list-style-type: none;
289+
}
290+
291+
ul.list li {
292+
clear: left;
293+
padding-bottom: 5px;
294+
}
295+
296+
ul.list li .left {
297+
float: left;
298+
}
299+
300+
ul.list li .left .avatar {
301+
width: 50px;
302+
height: 50px;
303+
}
304+
305+
ul.list li .item {
306+
margin-left: 80px;
307+
}
308+
309+
ul.list li .item .avatar {
310+
float: left;
311+
margin: 0 5px 5px 0;
312+
width: 30px;
313+
height: 30px;
314+
}
315+
316+
/* box */
317+
318+
#box {
319+
width: 500px;
320+
margin: 50px auto;
321+
}
322+
323+
#box .block {
324+
margin-bottom: 20px;
325+
}
326+
327+
#box .block h2 {
328+
padding: 10px 15px;
329+
margin: 0;
330+
}
331+
332+
#box .block .content {
333+
padding: 10px 20px;
334+
}
335+
336+

chef-server-slice/public/stylesheets/editor.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

chef-server-slice/public/stylesheets/themes

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)