8000 merged branch fabpot/public-resources (PR #6000) · lanthaler/symfony@83de4c2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 83de4c2

Browse files
fabpotfabpot
committed
merged branch fabpot/public-resources (PR symfony#6000)
This PR was merged into the master branch. Commits ------- 0159358 refactored CSS, images, templates included in the built-in bundles 812b9b1 replace _ in stylesheets (ids and classes) by - (should be consistent across the whole framework now) 983b2b5 uniformized styles e0aab40 renamed sf-exceptionreset to sf-reset Discussion ---------- Public resources refactoring The first 3 commits are just cosmetic ones. The last one refactors CSS, images, and templates included in the built-in bundles. Right now, everything is tied to the exception pages, but the code can be used standalone. So, the goal is to make things more decoupled and more reusable across different bundles. That way, a bundle can provide pages that look like the other ones in Symfony without the need to duplicate code. See the associated PR for the distribution bundle to see an example. If you want to have a look at the last commit (not sure if it is worth it), you probably want to append ?w=1 to the URL to avoid too much whitespace noise. --------------------------------------------------------------------------- by pborreli at 2012-11-13T09:38:00Z congrats ! symfony#6000 --------------------------------------------------------------------------- by fabpot at 2012-11-13T09:38:39Z A simple usage example: ```jinja {% extends "TwigBundle::layout.html.twig" %} {% block body %} <div class="block"> FOOBAR </div> {% endblock %} ```
2 parents d45a76b + 0159358 commit 83de4c2

30 files changed

+457
-618
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
/*
2+
Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3+
Code licensed under the BSD License:
4+
http://developer.yahoo.com/yui/license.html
5+
version: 3.1.2
6+
build: 56
7+
*/
8+
.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left 8000 ;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;}
9+
.sf-reset html,
10+
.sf-reset body {
11+
width: 100%;
12+
min-height: 100%;
13+
_height: 100%;
14+
margin: 0;
15+
padding: 0;
16+
}
17+
.sf-reset body {
18+
font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
19+
text-align: left;
20+
background-color: #efefef;
21+
}
22+
.sf-reset abbr {
23+
border-bottom: 1px dotted #000;
24+
cursor: help;
25+
}
26+
.sf-reset p {
27+
font-size: 14px;
28+
line-height: 20px;
29+
padding-bottom: 20px;
30+
}
31+
.sf-reset strong {
32+
color: #313131;
33+
font-weight: bold;
34+
}
35+
.sf-reset a {
36+
color: #6c6159;
37+
}
38+
.sf-reset a img {
39+
border: none;
40+
}
41+
.sf-reset a:hover {
42+
text-decoration: underline;
43+
}
44+
.sf-reset em {
45+
font-style: italic;
46+
}
47+
.sf-reset h2,
48+
.sf-reset h3 {
49+
font-weight: bold;
50+
}
51+
.sf-reset h1 {
52+
font-family: Georgia, "Times New Roman", Times, serif;
53+
font-size: 20px;
54+
color: #313131;
55+
word-break: break-all;
56+
}
57+
.sf-reset li {
58+
padding-bottom: 10px;
59+
}
60+
.sf-reset .block {
61+
-moz-border-radius: 16px;
62+
-webkit-border-radius: 16px;
63+
border-radius: 16px;
64+
margin-bottom: 20px;
65+
background-color: #FFFFFF;
66+
border: 1px solid #dfdfdf;
67+
padding: 40px 50px;
68+
}
69+
.sf-reset h2 {
70+
font-size: 16px;
71+
font-family: Arial, Helvetica, sans-serif;
72+
}
73+
.sf-reset li a {
74+
background: none;
75+
color: #868686;
76+
text-decoration: none;
77+
}
78+
.sf-reset li a:hover {
79+
background: none;
80+
color: #313131;
81+
text-decoration: underline;
82+
}
83+
.sf-reset ol {
84+
padding: 10px 0;
85+
}
86+
.sf-reset ol li {
87+
list-style: decimal;
88+
margin-left: 20px;
89+
padding: 2px;
90+
padding-bottom: 20px;
91+
}
92+
.sf-reset ol ol li {
93+
list-style-position: inside;
94+
margin-left: 0;
95+
white-space: nowrap;
96+
font-size: 12px;
97+
padding-bottom: 0;
98+
}
99+
.sf-reset li .selected {
100+
background-color: #ffd;
101+
}
102+
.sf-button {
103+
display: -moz-inline-box;
104+
display: inline-block;
105+
text-align: center;
106+
vertical-align: middle;
107+
border: 0;
108+
background: transparent none;
109+
text-transform: uppercase;
110+
cursor: pointer;
111+
font: bold 11px Arial, Helvetica, sans-serif;
112+
}
113+
.sf-button span {
114+
text-decoration: none;
115+
display: block;
116+
height: 28px;
117+
float: left;
118+
}
119+
.sf-button .border-l {
120+
text-decoration: none;
121+
display: block;
122+
height: 28px;
123+
float: left;
124+
padding: 0 0 0 7px;
125+
background: transparent url(../images/border_l.png) no-repeat top left;
126+
}
127+
.sf-button .border-r {
128+
padding: 0 7px 0 0;
129+
background: transparent url(../images/border_r.png) right top no-repeat;
130+
}
131+
.sf-button .btn-bg {
132+
padding: 0px 14px;
133+
color: #636363;
134+
line-height: 28px;
135+
background: transparent url(../images/btn_bg.png) repeat-x top left;
136+
}
137+
.sf-button:hover .border-l,
138+
.sf-button-selected .border-l {
139+
background: transparent url(../images/border_l_hover.png) no-repeat top left;
140+
}
141+
.sf-button:hover .border-r,
142+
.sf-button-selected .border-r {
143+
background: transparent url(../images/border_r_hover.png) right top no-repeat;
144+
}
145+
.sf-button:hover .btn-bg,
146+
.sf-button-selected .btn-bg {
147+
color: #FFFFFF;
148+
text-shadow:0 1px 1px #6b9311;
149+
background: transparent url(../images/btn_bg_hover.png) repeat-x top left;
150+
}

0 commit comments

Comments
 (0)
0