From 9c0218da1093643539af7695ee5b758670b3af01 Mon Sep 17 00:00:00 2001 From: Eric Bidelman Date: Thu, 20 Jun 2013 19:56:30 -0700 Subject: [PATCH] removing dead code. moving script to bottom --- static/css/main.css | 2 +- static/sass/main.scss | 5 ++++- templates/admin/features/new.html | 10 ++++------ templates/header.html | 2 +- users.py | 4 ---- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/static/css/main.css b/static/css/main.css index d5cb7f7c..aa5de9cd 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1 +1 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}*{box-sizing:border-box}a{text-decoration:none}a:hover{text-decoration:underline}html,body{height:100%}body{color:#666;font:14px "Open Sans", Arial, sans-serif;background-color:#eee}h1,h2,h3,h4{font-weight:300}h1{font-size:30px}h2{font-size:25px}h3{font-size:20px}a{color:#4580c0}a:hover{color:#366597;text-decoration:none}b{font-weight:bold}input,textarea{outline:none;padding:7px}input:not([type="submit"]),textarea{border:1px solid #d4d4d4}input:not([type="submit"])[disabled],textarea[disabled]{opacity:0.5}table th{max-width:200px}table th,table td{padding-bottom:10px}table .helptext{font-style:italic;font-size:smaller}table input[type="text"],table textarea{width:100%}table select{max-width:350px}table :required{border:1px solid #366597}table .interacted:valid{border:1px solid green}table .interacted:invalid{border:1px solid rgba(255,0,0,0.75)}table .errorlist{color:red}header,footer{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;text-shadow:0 1px 0 white}header{margin:15px 0 0 0;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}header aside{-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);border-top-right-radius:5px;border-bottom-right-radius:5px;border-bottom:1px solid #d4d4d4;border-right:1px solid #d4d4d4;background-color:#FAFAFA;padding:0.75em 1em;background:url(/static/img/chromium-128.png) no-repeat 10px 50%,#fafafa;background-size:20%;padding-left:125px}header aside hgroup{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical}header aside h1{line-height:1}header aside img{height:45px;width:45px;margin-right:7px}header nav{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-box-align:center;-moz-box-align:center;-ms-box-align:center;-o-box-align:center;box-align:center;margin-left:3em}header nav a{background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);-webkit-flex:1;-moz-flex:1;-ms-flex:1;-o-flex:1;flex:1;cursor:pointer;margin-right:1em;font-size:16px;text-align:center;border-radius:3px;border-bottom:1px solid #d4d4d4;border-right:1px solid #d4d4d4}header nav a:hover{color:#4580c0}header nav a:active{position:relative;top:1px;left:1px;box-shadow:3px 3px 4px rgba(0,0,0,0.065)}header nav a.disabled{opacity:0.5;pointer-events:none}footer{background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);font-size:12px;box-shadow:0 -2px 5px rgba(0,0,0,0.065);-webkit-justify-content:center;-moz-justify-content:center;-ms-justify-content:center;-o-justify-content:center;justify-content:center;-webkit-box-pack:center;-moz-box-pack:center;-ms-box-pack:center;-o-box-pack:center;box-pack:center;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical;display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;text-align:center;position:relative}footer div{margin-top:5px}#subheader{display:-webkit-flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:flex;-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;margin:30px 30px 0 30px}#subheader div{margin-right:45px}#container{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-flex-direction:column;-moz-flex-direction:column;-ms-flex-direction:column;-o-flex-direction:column;flex-direction:column;height:100%;width:100%;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical}#content{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-justify-content:center;-moz-justify-content:center;-ms-justify-content:center;-o-justify-content:center;justify-content:center;-webkit-flex:1 0 0;-moz-flex:1 0 0;-ms-flex:1 0 0;-o-flex:1 0 0;flex:1 0 0;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical;margin:15px 30px;overflow:auto;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1}#content iframe{border:none;width:100%;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1}#panels{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box}#panels nav{font-size:125%;font-weight:300;width:120px}#panels nav li{padding:5px 0}#panels nav li:first-of-type{padding-top:0}#panels nav chromedash-metadata{position:fixed;height:50vh;overflow:auto}#panels chromedash-app{-webkit-flex:1 0 0;-moz-flex:1 0 0;-ms-flex:1 0 0;-o-flex:1 0 0;flex:1 0 0;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1;height:100%}@media only screen and (max-width: 700px){h1{font-size:25px}h2{font-size:20px}h3{font-size:15px}#container{display:block}#content{margin:0}header{margin:0;display:block}header aside{padding:0.35em 0.35em 0.35em 100px}header nav{margin:10px 0;-webkit-box-pack:center;-moz-box-pack:center;-ms-box-pack:center;-o-box-pack:center;box-pack:center}header nav a{display:inline-block;padding:5px 10px}#panels{display:block}#panels nav{display:none}#subheader{display:none;margin:15px 0}#subheader div{margin-right:30px}chromedash-feature,[is="chromedash-feature"]{box-shadow:none !important;border-radius:0 !important;padding:10px !important;margin:0 !important}footer{padding:0.35em}} +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}*{box-sizing:border-box}a{text-decoration:none}a:hover{text-decoration:underline}html,body{height:100%}body{color:#666;font:14px "Open Sans", Arial, sans-serif;background-color:#eee}h1,h2,h3,h4{font-weight:300}h1{font-size:30px}h2{font-size:25px}h3{font-size:20px}a{color:#4580c0}a:hover{color:#366597;text-decoration:none}b{font-weight:bold}input,textarea{outline:none;padding:7px}input:not([type="submit"]),textarea{border:1px solid #d4d4d4}input:not([type="submit"])[disabled],textarea[disabled]{opacity:0.5}table th{max-width:200px}table th,table td{padding-bottom:10px}table .helptext{font-style:italic;font-size:smaller}table input[type="text"],table textarea{width:100%}table select{max-width:350px}table :required{border:1px solid #366597}table .interacted:valid{border:1px solid green}table .interacted:invalid{border:1px solid rgba(255,0,0,0.75)}table .errorlist{color:red}header,footer{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;text-shadow:0 1px 0 white}header{margin:15px 0 0 0;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}header aside{-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);border-top-right-radius:5px;border-bottom-right-radius:5px;border-bottom:1px solid #d4d4d4;border-right:1px solid #d4d4d4;background-color:#FAFAFA;padding:0.75em 1em;background:url(/static/img/chromium-128.png) no-repeat 10px 50%,#fafafa;background-size:25%;padding-left:125px}header aside hgroup{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical}header aside h1{line-height:1}header aside h1 a{color:currentcolor}header aside img{height:45px;width:45px;margin-right:7px}header nav{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-box-align:center;-moz-box-align:center;-ms-box-align:center;-o-box-align:center;box-align:center;margin-left:3em}header nav a{background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);-webkit-flex:1;-moz-flex:1;-ms-flex:1;-o-flex:1;flex:1;cursor:pointer;margin-right:1em;font-size:16px;text-align:center;border-radius:3px;border-bottom:1px solid #d4d4d4;border-right:1px solid #d4d4d4}header nav a:hover{color:#4580c0}header nav a:active{position:relative;top:1px;left:1px;box-shadow:3px 3px 4px rgba(0,0,0,0.065)}header nav a.disabled{opacity:0.5;pointer-events:none}footer{background-color:#FAFAFA;background:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2));background:-webkit-linear-gradient(top, #ffffff,#f2f2f2);background:-moz-linear-gradient(top, #ffffff,#f2f2f2);background:-o-linear-gradient(top, #ffffff,#f2f2f2);background:linear-gradient(top, #ffffff,#f2f2f2);padding:0.75em 1em;box-shadow:1px 1px 4px rgba(0,0,0,0.065);font-size:12px;box-shadow:0 -2px 5px rgba(0,0,0,0.065);-webkit-justify-content:center;-moz-justify-content:center;-ms-justify-content:center;-o-justify-content:center;justify-content:center;-webkit-box-pack:center;-moz-box-pack:center;-ms-box-pack:center;-o-box-pack:center;box-pack:center;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical;display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;text-align:center;position:relative}footer div{margin-top:5px}#subheader{display:-webkit-flex;display:-moz-flex;display:-ms-flex;display:-o-flex;display:flex;-webkit-align-items:center;-moz-align-items:center;-ms-align-items:center;-o-align-items:center;align-items:center;margin:30px 30px 0 30px}#subheader div{margin-right:45px}#container{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-flex-direction:column;-moz-flex-direction:column;-ms-flex-direction:column;-o-flex-direction:column;flex-direction:column;height:100%;width:100%;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical}#content{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box;-webkit-justify-content:center;-moz-justify-content:center;-ms-justify-content:center;-o-justify-content:center;justify-content:center;-webkit-flex:1 0 0;-moz-flex:1 0 0;-ms-flex:1 0 0;-o-flex:1 0 0;flex:1 0 0;-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-box-orient:vertical;-o-box-orient:vertical;box-orient:vertical;margin:15px 30px;overflow:auto;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1}#content iframe{border:none;width:100%;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1}#panels{display:-webkit-box;display:-moz-box;display:-ms-box;display:-o-box;display:box}#panels nav{font-size:125%;font-weight:300;width:120px}#panels nav li{padding:5px 0}#panels nav li:first-of-type{padding-top:0}#panels nav chromedash-metadata{position:fixed;height:50vh;overflow:auto}#panels chromedash-app{-webkit-flex:1 0 0;-moz-flex:1 0 0;-ms-flex:1 0 0;-o-flex:1 0 0;flex:1 0 0;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;-o-box-flex:1;box-flex:1;height:100%}@media only screen and (max-width: 700px){h1{font-size:25px}h2{font-size:20px}h3{font-size:15px}#container{display:block}#content{margin:0}header{margin:0;display:block}header aside{padding:0.35em 0.35em 0.35em 100px}header nav{margin:10px 0;-webkit-box-pack:center;-moz-box-pack:center;-ms-box-pack:center;-o-box-pack:center;box-pack:center}header nav a{display:inline-block;padding:5px 10px}#panels{display:block}#panels nav{display:none}#subheader{display:none;margin:15px 0}#subheader div{margin-right:30px}chromedash-feature,[is="chromedash-feature"]{box-shadow:none !important;border-radius:0 !important;padding:10px !important;margin:0 !important}footer{padding:0.35em}} diff --git a/static/sass/main.scss b/static/sass/main.scss index 76762690..e7cdff7b 100644 --- a/static/sass/main.scss +++ b/static/sass/main.scss @@ -116,7 +116,7 @@ header { // padding-left: 65px; // Larger bg logo. background: url(/static/img/chromium-128.png) no-repeat 10px 50%, #FAFAFA; - background-size: 20%; + background-size: 25%; padding-left: 125px; // TODO: temporary for old flex box support. @@ -129,6 +129,9 @@ header { line-height: 1; //white-space: nowrap; //width: -webkit-min-content; + a { + color: currentcolor; + } } img { height: 45px; diff --git a/templates/admin/features/new.html b/templates/admin/features/new.html index 6a8be226..7ded287b 100644 --- a/templates/admin/features/new.html +++ b/templates/admin/features/new.html @@ -22,10 +22,8 @@ -{% for f in features %} - -
  • {{f.feature_name}}
    • -{% endfor %} - - {% endblock %} + +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index b13813f5..d2b413d2 100644 --- a/templates/header.html +++ b/templates/header.html @@ -2,7 +2,7 @@ diff --git a/users.py b/users.py index 95679d48..fd7cc7e6 100644 --- a/users.py +++ b/users.py @@ -38,10 +38,6 @@ class UserHandler(common.ContentHandler): if path[-1] == '/': return self.redirect(self.request.path.rstrip('/')) - # template_data = { - # 'users': models.AppUser.all().fetch(None) # TODO(ericbidelman): memcache this. - # } - users = models.AppUser.all().fetch(None) # TODO(ericbidelman): memcache this. user_list = []