Adjusts to mantain compatibility of general and especific page style definitions

Melissa Wen
1 parent 2ed24855
Showing 2 changed files with 52 additions and 18 deletions Show diff stats
css/main-content.css
css/overwriting-base-theme.css
 /*** Box ***/
 .box-1 .block,
 .no-boxes .block {
-    margin-top: 50px;
+  margin-top: 50px;
 }
  
-.block-outer {
-    margin-bottom: 45px;
-    clear: both;
+.box-2 .block-outer,
+.box-3 .block-outer{
+  margin-bottom: 45px;
+  clear: both;
 }
  
 /*** Block Title ***/
@@ -41,13 +42,13 @@
 #content .pagination a,
 #content .pagination em,
 #content .pagination span{
-  padding: 7px 11px 7px 11px;
+  padding: 5px 9px;
   margin-right: 4px;
   color: #172738;
   border: 1px solid #D3D6DE;
   border-radius: 4px;
   letter-spacing: 0.6px;
-  font-size: 15px;
+  font-size: 12px;
   font-weight: 700;
   text-decoration: none;
   display: inline-table;
@@ -59,13 +60,11 @@
 }
  
 #content .pagination .previous_page{
-  padding: 7px 11px 10px 11px;
   float: left;
 }
  
 #content .pagination .next_page{
   float: right;
-  padding: 7px 11px 10px 11px;
 }
  
 #content .pagination .previous_page,
@@ -80,5 +79,39 @@
   opacity: 0.5;
 }
  
+/*** Button ***/
+
+#content a.button.with-text,
+#content #article-actions a.button.with-text{
+  height: 32px;
+  padding: 5px 15px;
+  background: #FFF none;
+  color: #3E67B1;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  font-size: 14px;
+  line-height: 32px;
+  text-transform: uppercase;
+}
+
+#content form input.button.with-text{
+  height: 42px;
+  max-height: 42px;
+  padding: 5px 15px;
+  background: #FFF none;
+  color: #3E67B1;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  font-size: 14px;
+  line-height: 32px;
+  text-transform: uppercase;
+}
+
+#content a.button:hover,
+#content #article-actions a.button.with-text:hover,
+#content input.button.with-text:hover{
+  background: #3E67B1 none;
+  color: #FFF;
+}
  
  
@@ -54,21 +54,22 @@
 #content .main-block h2,
 #content .main-block h3,
 #content .main-block h4 {
-  font-family:  'Open Sans', Arial, Helvetica, sans-serif;
+  font-family:  Arial, Helvetica, sans-serif;
 }
  
 #content .main-block h1,
 #not-found h1,
 #access-denied h1,
 #content .no-boxes h1 {
-  color: #444;
-  font-size: 1.7em;
-  padding: 7px 0;
-  margin-left: 0;
-  padding-left: 0.3em;
-  border-bottom: 1px solid #CCCCCC;
-  border-top: 0px solid #172838;
+  margin: 20px 0 10px 0;
+  padding: 0;
+  color: #172738;
+  border-bottom: none;
+  font-family: Arial;
+  font-size: 34px;
   font-weight: bold;
+  font-variant: normal;
+  line-height: 37px;
 }
  
 #content .title {
@@ -77,8 +78,8 @@
 }
  
 #content .main-block h3 {
-  font-size: 1.5em;
-  min-height: 48px;
+  font-size:18px;
+  line-height: 21px;
 }
  
 /****************************************/
1	1	/* Box */
2	2	.box-1 .block,
3	3	.no-boxes .block {
4		- margin-top: 50px;
	4	+ margin-top: 50px;
5	5	}
6	6
7		-.block-outer {
8		- margin-bottom: 45px;
9		- clear: both;
	7	+.box-2 .block-outer,
	8	+.box-3 .block-outer{
	9	+ margin-bottom: 45px;
	10	+ clear: both;
10	11	}
11	12
12	13	/* Block Title */
...	...	@@ -41,13 +42,13 @@
41	42	#content .pagination a,
42	43	#content .pagination em,
43	44	#content .pagination span{
44		- padding: 7px 11px 7px 11px;
	45	+ padding: 5px 9px;
45	46	margin-right: 4px;
46	47	color: #172738;
47	48	border: 1px solid #D3D6DE;
48	49	border-radius: 4px;
49	50	letter-spacing: 0.6px;
50		- font-size: 15px;
	51	+ font-size: 12px;
51	52	font-weight: 700;
52	53	text-decoration: none;
53	54	display: inline-table;
...	...	@@ -59,13 +60,11 @@
59	60	}
60	61
61	62	#content .pagination .previous_page{
62		- padding: 7px 11px 10px 11px;
63	63	float: left;
64	64	}
65	65
66	66	#content .pagination .next_page{
67	67	float: right;
68		- padding: 7px 11px 10px 11px;
69	68	}
70	69
71	70	#content .pagination .previous_page,
...	...	@@ -80,5 +79,39 @@
80	79	opacity: 0.5;
81	80	}
82	81
	82	+/* Button */
	83	+
	84	+#content a.button.with-text,
	85	+#content #article-actions a.button.with-text{
	86	+ height: 32px;
	87	+ padding: 5px 15px;
	88	+ background: #FFF none;
	89	+ color: #3E67B1;
	90	+ border-radius: 4px;
	91	+ border: 1px solid #3E67B1;
	92	+ font-size: 14px;
	93	+ line-height: 32px;
	94	+ text-transform: uppercase;
	95	+}
	96	+
	97	+#content form input.button.with-text{
	98	+ height: 42px;
	99	+ max-height: 42px;
	100	+ padding: 5px 15px;
	101	+ background: #FFF none;
	102	+ color: #3E67B1;
	103	+ border-radius: 4px;
	104	+ border: 1px solid #3E67B1;
	105	+ font-size: 14px;
	106	+ line-height: 32px;
	107	+ text-transform: uppercase;
	108	+}
	109	+
	110	+#content a.button:hover,
	111	+#content #article-actions a.button.with-text:hover,
	112	+#content input.button.with-text:hover{
	113	+ background: #3E67B1 none;
	114	+ color: #FFF;
	115	+}
83	116
84	117
...	...
...	...	@@ -54,21 +54,22 @@
54	54	#content .main-block h2,
55	55	#content .main-block h3,
56	56	#content .main-block h4 {
57		- font-family: 'Open Sans', Arial, Helvetica, sans-serif;
	57	+ font-family: Arial, Helvetica, sans-serif;
58	58	}
59	59
60	60	#content .main-block h1,
61	61	#not-found h1,
62	62	#access-denied h1,
63	63	#content .no-boxes h1 {
64		- color: #444;
65		- font-size: 1.7em;
66		- padding: 7px 0;
67		- margin-left: 0;
68		- padding-left: 0.3em;
69		- border-bottom: 1px solid #CCCCCC;
70		- border-top: 0px solid #172838;
	64	+ margin: 20px 0 10px 0;
	65	+ padding: 0;
	66	+ color: #172738;
	67	+ border-bottom: none;
	68	+ font-family: Arial;
	69	+ font-size: 34px;
71	70	font-weight: bold;
	71	+ font-variant: normal;
	72	+ line-height: 37px;
72	73	}
73	74
74	75	#content .title {
...	...	@@ -77,8 +78,8 @@
77	78	}
78	79
79	80	#content .main-block h3 {
80		- font-size: 1.5em;
81		- min-height: 48px;
	81	+ font-size:18px;
	82	+ line-height: 21px;
82	83	}
83	84
84	85	/****************************************/
...	...