ABS/abscontrol Commit - r140:141 · Jicamarca Repository

- Mejorando el estilo(css) de la aplicacion web.

jsalyrosas -

r140:141

parent child

Context file:

r140:141

Collapse all files

trunk/webapp/static/css/style.css +9 -63

@@ -1,70 +1,16
1	@font-face {	1	/*
	No newline at end of file		No newline at end of file
2	font-family: '~~Open~~ Sans';	2	* font-family: 'Droid Sans', sans-serif;
	No newline at end of file		No newline at end of file
3	font-style: normal;	3	* font-family: 'Ubuntu', sans-serif;
	No newline at end of file		No newline at end of file
4	font-weight: 300;	4	* font-family: 'Open Sans', sans-serif;
	No newline at end of file		No newline at end of file
5	src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff');	5	* font-family: 'Open Sans Condensed', sans-serif;
	No newline at end of file		No newline at end of file
6	}	6	* font-family: 'Roboto Condensed', sans-serif;
	No newline at end of file		No newline at end of file
7	@font-face {	7	*/ No newline at end of file
	No newline at end of file
8	font-family: 'Open Sans';
	No newline at end of file
9	font-style: normal;
	No newline at end of file
10	font-weight: 400;
	No newline at end of file
11	src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
	No newline at end of file
12	}
	No newline at end of file
13	@font-face {
	No newline at end of file
14	font-family: 'Open Sans';
	No newline at end of file
15	font-style: normal;
	No newline at end of file
16	font-weight: 600;
	No newline at end of file
17	src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff) format('woff');
	No newline at end of file
18	}
	No newline at end of file
19	@font-face {
	No newline at end of file
20	font-family: 'Open Sans';
	No newline at end of file
21	font-style: normal;
	No newline at end of file
22	font-weight: 700;
	No newline at end of file
23	src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff');
	No newline at end of file
24	}
	No newline at end of file
25	@font-face {
	No newline at end of file
26	font-family: 'Open Sans';
	No newline at end of file
27	font-style: normal;
	No newline at end of file
28	font-weight: 800;
	No newline at end of file
29	src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hnhCUOGz7vYGh680lGh-uXM.woff) format('woff');
	No newline at end of file
30	}
	No newline at end of file
31	@font-face {
	No newline at end of file
32	font-family: 'Open Sans';
	No newline at end of file
33	font-style: italic;
	No newline at end of file
34	font-weight: 300;
	No newline at end of file
35	src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxh_xHqYgAV9Bl_ZQbYUxnQU.woff) format('woff');
	No newline at end of file
36	}
	No newline at end of file
37	@font-face {
	No newline at end of file
38	font-family: 'Open Sans';
	No newline at end of file
39	font-style: italic;
	No newline at end of file
40	font-weight: 400;
	No newline at end of file
41	src: local('Open Sans Italic'), local('OpenSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff) format('woff');
	No newline at end of file
42	}
	No newline at end of file
43	@font-face {
	No newline at end of file
44	font-family: 'Open Sans';
	No newline at end of file
45	font-style: italic;
	No newline at end of file
46	font-weight: 600;
	No newline at end of file
47	src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxn5HxGBcBvicCpTp6spHfNo.woff) format('woff');
	No newline at end of file
48	}
	No newline at end of file
49	@font-face {
	No newline at end of file
50	font-family: 'Open Sans';
	No newline at end of file
51	font-style: italic;
	No newline at end of file
52	font-weight: 700;
	No newline at end of file
53	src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxjqR_3kx9_hJXbbyU8S6IN0.woff) format('woff');
	No newline at end of file
54	}
	No newline at end of file
55	@font-face {
	No newline at end of file
56	font-family: 'Open Sans';
	No newline at end of file
57	font-style: italic;
	No newline at end of file
58	font-weight: 800;
	No newline at end of file
59	src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxkCDe67GEgBv_HnyvHTfdew.woff) format('woff');
	No newline at end of file
60	} No newline at end of file
61		8
	No newline at end of file	9	body { font-size: 11px; } No newline at end of file
62	body {font-size: 11px; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif}
	No newline at end of file
63	article, aside, figure, footer, header, hgroup, nav, section { display:block; } No newline at end of file
64	header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px} No newline at end of file	10	header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
65	#schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px} No newline at end of file	11	#schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
66	#content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}	12	#content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
	No newline at end of file	13	#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; } No newline at end of file
67	#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; font-family: Monaco;} No newline at end of file
68	#content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;} No newline at end of file	14	#content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
69	footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px} No newline at end of file	15	footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
70	No newline at end of file	16

trunk/webapp/templates/abscontrol/edit.html +2 -2

                     <div id="infoPattern">
                         {% if patternChoosen %}
                         <div id="navPatterns">
                             <nav class="" id="navPatternList">
-                            <nav class="MnuHorizontal">
+             No newline at end of file
                                 <ul>
  No newline at end of file
-                                <ul class="mnu" id="navPatternList">
  No newline at end of file
                             {% for element in lsPatterns %}
                                 {% if patternChoosen.id == element.id %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>

trunk/webapp/templates/abscontrol/index.html +1 -1

                         </div>
                     </div>
                     {% block mnu_profile %}
                     <nav class="MnuVertical" id="mnuProfiles">
  No newline at end of file
-                    <nav>
  No newline at end of file
                         <ul>
                             <li><a href="/abscontrol/new">New</a></li>
                             {% if objProfile %}

trunk/webapp/templates/abscontrol/view.html +2 -2

                     <div id="infoPattern">
                         {% if patternChoosen %}
                         <div id="navPatterns">
                             <nav class="" id="navPatternList">
-                            <nav class="MnuHorizontal">
+             No newline at end of file
                                 <ul>
  No newline at end of file
-                                <ul class="mnu" id="navPatternList">
  No newline at end of file
                             {% for element in lsPatterns %}
                                 {% if patternChoosen.id == element.id %}
                                 <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>

trunk/webapp/templates/abscontrol/viewPattern.html +2 -2

             <div id="infoPattern">
                 {% if patternChoosen %}
                 <div id="navPatterns">
                     <nav class="" id="navPatternList">
-                    <nav class="MnuHorizontal">
+             No newline at end of file
                         <ul>
  No newline at end of file
-                        <ul class="mnu" id="navPatternList">
  No newline at end of file
                         {% for element in lsPatterns %}
                             {% if patternChoosen.id == element.id %}
                             <li><a href="/abscontrol/{{ objProfile.id }}/view/{{ element.id }}" class="lnkPatternSelected">{{ element.value }}</a></li>

trunk/webapp/templates/base.html +1 0

                     Remove this if you use the .htaccess -->
                     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                     {% endcomment %}
+                    <link href='http://fonts.googleapis.com/css?family=Droid+Sans|Ubuntu:400,500,300italic|Open+Sans:400,300,600|Open+Sans+Condensed:300,700|Roboto+Condensed:400,300' rel='stylesheet' type='text/css'>
  No newline at end of file
                     <link rel="stylesheet" href="{% static 'static/css/style.css' %}" type="text/css" />
                     <script src="{% static 'static/js/jquery-1.9.1.min.js' %}"></script>
                     {% block scripting %}{% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages