Skip to content

Commit ab74e5c

Browse files
committed
Somehow the recent merge with trunk ended up with the CSS directory from trunk rather than the facelift one (Subversion was acting weird) - reestablish the facelift one, and also recover the qunit CSS/JS files which accidentally was left
- Legacy-Id: 9071
1 parent eccd8d2 commit ab74e5c

52 files changed

Lines changed: 4548 additions & 557 deletions

Some content is hidden

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

static/css/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
/* first some global settings to make the pages have the same environment as in the pre-Bootstrap days */
2+
.content {
3+
padding: 0;
4+
font: 13px/1.231 arial,helvetica,clean,sans-serif;
5+
}
6+
7+
.content * {
8+
box-sizing: content-box;
9+
}
10+
11+
.content th {
12+
text-align: center;
13+
}
14+
15+
.content button { font: normal; color: #000; }
16+
17+
.content .close { float: none; opacity: 1; }
18+
19+
.content table { border-collapse: separate; border-spacing: 2px; }
20+
21+
.ietf-navbar { background-color: #edf5ff; padding:0; border: 1px solid #89d; margin-top:4px; width: 130px; }
22+
.ietf-navbar ul { padding: 0; margin: 0; }
23+
.ietf-navbar ul li { list-style: none; padding: 0; margin: 0; font-size: 93%; padding: 2px 0px 2px 0px; }
24+
.ietf-navbar ul li.yuimenuitem { padding: 0px 0px 1px 0px; border: 0;}
25+
.ietf-navbar ul li a { padding: 0px 0px 0px 10px; }
26+
.ietf-navbar ul li.sect a { padding: 2px 2px 2px 2px; }
27+
.ietf-navbar ul li.sect { font-weight:bold; color:#fff; background:#2647A0; margin-top:2px; text-indent:2px; padding: 2px 0;}
28+
.ietf-navbar ul li.first { margin-top: 0px; }
29+
.ietf-navbar ul li.sect a { color:#fff; }
30+
.ietf-navbar a, .ietf-navbar a:visited { color: #000000; }
31+
.ietf-navbar > ul > li > a:hover { background-color: #b3d4ff; }
32+
.ietf-navbar .yuimenuitemlabel { font-size: 12px; padding: 0 10px; }
33+
.ietf-navbar #wgs .bd { background-color: #edf5ff; }
34+
.ietf-navbar #wgs > .bd { border: 0;}
35+
36+
37+
/* rest of agenda edit settings */
38+
139
.IETF-scheme, .meeting_event th.IETF-scheme, #IETF-groups, #selector-IETF {
240
color: black;
341
background-color: white;
@@ -509,21 +547,21 @@ div.conflictlevel {
509547

510548
div.our-conflict {
511549
padding-left: 20px;
512-
background-image: url('/images/conflict-boxes/narow3.png');
550+
background-image: url('images/conflict-boxes/narow3.png');
513551
background-position: 8px 50%;
514552
background-repeat: no-repeat;
515553
}
516554

517555
div.our-conflic2 {
518556
padding-left: 20px;
519-
background-image: url('/images/conflict-boxes/narow2.png');
557+
background-image: url('images/conflict-boxes/narow2.png');
520558
background-position: 8px 50%;
521559
background-repeat: no-repeat;
522560
}
523561

524562
div.our-conflic3 {
525563
padding-left: 20px;
526-
background-image: url('/images/conflict-boxes/narow1.png');
564+
background-image: url('images/conflict-boxes/narow1.png');
527565
background-position: 8px 50%;
528566
background-repeat: no-repeat;
529567
}
@@ -682,21 +720,21 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99beff', end
682720
*/
683721
table.actual_conflict {
684722
padding-left: 20px;
685-
background-image: url('/images/conflict-boxes/narow3.png');
723+
background-image: url('images/conflict-boxes/narow3.png');
686724
background-position: 8px 50%;
687725
background-repeat: no-repeat;
688726
}
689727

690728
table.actual_conflic2 {
691729
padding-left: 20px;
692-
background-image: url('/images/conflict-boxes/narow2.png');
730+
background-image: url('images/conflict-boxes/narow2.png');
693731
background-position: 8px 50%;
694732
background-repeat: no-repeat;
695733
}
696734

697735
table.actual_conflic3 {
698736
padding-left: 20px;
699-
background-image: url('/images/conflict-boxes/narow1.png');
737+
background-image: url('images/conflict-boxes/narow1.png');
700738
background-position: 8px 50%;
701739
background-repeat: no-repeat;
702740
}
@@ -801,7 +839,7 @@ td.ourconflicts, td.theirconflicts {
801839
}
802840

803841
.highlight_free_slot{
804-
background-image: url('/images/green_hatch.png');
842+
background-image: url('images/green_hatch.png');
805843
}
806844

807845

@@ -816,13 +854,13 @@ td.ourconflicts, td.theirconflicts {
816854
}
817855

818856
.free_slot{
819-
background-image: url('/images/empty.png') no-repeat;
857+
/* background-image: url('images/empty.png') no-repeat;*/ /* 404, this file doesn't exist? */
820858
/* background-color:rgb(0, 102, 153) !important; /* the important tag should fix any precedence issues */
821859
}
822860

823861

824862
/* from: http://www.usabilitypost.com/2012/01/10/pressed-button-state-with-css3/# */
825-
.styled_button {
863+
.content .styled_button {
826864
/* padding: 10px 15px; */
827865
background: #4479BA;
828866
color: #FFF;
@@ -842,13 +880,13 @@ td.ourconflicts, td.theirconflicts {
842880
-ms-user-select:none;
843881
user-select:none;
844882
}
845-
.styled_button:hover {
883+
.content .styled_button:hover {
846884
cursor:pointer;
847885
background: #356094;
848886
border: solid 1px #2A4E77;
849887
text-decoration: none;
850888
}
851-
.styled_button:active {
889+
.content .styled_button:active {
852890
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
853891
-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
854892
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
@@ -866,7 +904,7 @@ td.ourconflicts, td.theirconflicts {
866904

867905
.agenda_slot_plenary {
868906
/* background-color: #d38f2d; */ /* dark orange */
869-
background-image: url('/images/orange_hatch.png');
907+
background-image: url('images/orange_hatch.png');
870908
}
871909

872910
.agenda_slot_session {
@@ -1104,7 +1142,7 @@ background: -webkit-linear-gradient(top, #99beff 0%,#1e5799 100%); /* Chrome10+,
11041142

11051143
/* copied from doc.css, maybe with some modifications. */
11061144
a.editlink {
1107-
background-image: url("/images/pencil.png");
1145+
background-image: url("images/pencil.png");
11081146
background-size: 10px;
11091147
background-position: right top;
11101148
background-attachment: scroll;
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ a img { border: 0; }
6868
.ietf-navbar #wgs > .bd { border: 0;}
6969

7070
.ietf-navset {
71-
background:#214197 url(/images/yui/sprite.png) repeat-x left -1400px;
71+
background:#214197 url(images/yui/sprite.png) repeat-x left -1400px;
7272
color:white;
7373
border:1px solid black;
7474
padding:4px;
@@ -188,7 +188,6 @@ form table .help, form table .helptext {
188188
.color2 { color: #00ffff; }
189189
.bgcolor1 { background-color: #ffb000; }
190190
.bgcolor2 { background-color: #00ffff; }
191-
.bgcolor3 { background-color: #f00000; }
192191
.square { width: 0.8ex; height: 0.8ex; margin: 0; padding: 0; display: inline-block; position: relative; top: 0.8ex; }
193192
.big { font-size: 109.5%; margin: 0; padding: 0; }
194193
.large { font-size: 120%; margin: 0; padding: 0; }
@@ -346,17 +345,6 @@ div.prompt { border: 1px dashed red; background-color: #ffeeaa; padding: 1em 2em
346345
margin: 12px;
347346
}
348347

349-
#feedbackformset table {width: 100%;}
350-
#feedbackformset .oddradio { background-color: white; text-align: center;}
351-
#feedbackformset .evenradio { background-color: #EDF5FF; text-align: center;}
352-
#feedbackformset .toggle { padding: 0px; }
353-
#feedbackformset .toggle a.trigger { display: block; width: 22px; height: 22px;}
354-
#feedbackformset .toggle a.closed { background: url(../images/plus.png) no-repeat center center;}
355-
#feedbackformset .toggle a.open { background: url(../images/minus.png) no-repeat center center;}
356-
#feedbackformset tr.body td { border-bottom: 1px solid #cbcbcb;}
357-
#feedbackformset tr.bodyform td { border-top: 1px solid #cbcbcb;}
358-
359-
360348
.baseform select,
361349
.baseform textarea,
362350
.baseform input {
1.87 KB
Binary file not shown.
203 Bytes
Loading
1.01 KB
Binary file not shown.
199 Bytes
Loading
803 Bytes
Binary file not shown.
200 Bytes
Loading
963 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)