From 6886b35265f720af13aea5377eaf07c6f3a8b3c5 Mon Sep 17 00:00:00 2001 From: William Farmer Date: Sat, 31 May 2014 17:36:33 -0600 Subject: [PATCH 1/3] Added style.css --- web/dgf.py | 1 + web/static/style.css | 61 +++++++++++++++++++++++++++++++++++++++ web/templates/layout.html | 61 +++++++++++++++------------------------ 3 files changed, 85 insertions(+), 38 deletions(-) create mode 100644 web/static/style.css diff --git a/web/dgf.py b/web/dgf.py index aa9a08b..daa1473 100755 --- a/web/dgf.py +++ b/web/dgf.py @@ -117,4 +117,5 @@ def collection_delete(schema_id, coll_id): return render_template("collection_delete.html", sid=schema_id, cid=coll_id) if __name__ == "__main__": + app.debug = True app.run() diff --git a/web/static/style.css b/web/static/style.css new file mode 100644 index 0000000..533f7bc --- /dev/null +++ b/web/static/style.css @@ -0,0 +1,61 @@ +body { + font-family: sans-serif; + background: #eee; +} +a { + color: #377ba8; +} +h1, h2 { + color: #000000; + font-family: 'Georgia', serif; + margin: 0; +} +h1 { + border-bottom: 2px solid #eee; +} +h2 { + font-size: 1.2em; +} + +.page { + margin: 2em auto; + width: 70em; + border: 5px solid #ccc; + padding: 0.8em; + background: white; +} + +.entries { + list-style: none; + margin: 0; + padding: 0; +} +.entries li { + margin: 0.8em 1.2em; +} +.entries li h2 { + margin-left: -1em; +} +.add-entry { + font-size: 0.9em; + border-bottom: 1px solid #ccc; +} +.add-entry dl { + font-weight: bold; +} +.metanav { + text-align: right; + font-size: 0.8em; + padding: 0.3em; + margin-bottom: 1em; + background: #fafafa; +} +.flash { + background: #cee5F5; + padding: 0.5em; + border: 1px solid #aacbe2; + } +.error { + background: #f0d6d6; + padding: 0.5em; +} diff --git a/web/templates/layout.html b/web/templates/layout.html index 9afb795..83a91cf 100644 --- a/web/templates/layout.html +++ b/web/templates/layout.html @@ -1,41 +1,26 @@ - -Data Gristle -
-

Data Gristle

- More Info + Home> + {% set path = request.path.split('/')[1:] %} + {% set lvl = '/' %} + {% for p in path %} + {% set lvl = lvl + path[loop.index - 1] + '/' %} + {% if lvl == request.path %} + {{ p }} + {% else %} + {{ p }}> + {% endif %} + {% endfor %} - Home> - {% set path = request.path.split('/')[1:] %} - {% set lvl = '/' %} - {% for p in path %} - {% set lvl = lvl + path[loop.index - 1] + '/' %} - {% if lvl == request.path %} - {{ p }} - {% else %} - {{ p }}> - {% endif %} - {% endfor %} - - {% block body %} - {% endblock %} -
+ {% block body %} + {% endblock %} + + From ac9075e75a8ab10f4d27017133ba0d56f101203b Mon Sep 17 00:00:00 2001 From: William Farmer Date: Sat, 31 May 2014 17:47:17 -0600 Subject: [PATCH 2/3] Added background image. Removed debug. --- web/dgf.py | 1 - web/static/background.png | Bin 0 -> 493 bytes web/static/style.css | 60 +++----------------------------------- web/templates/layout.html | 4 ++- 4 files changed, 7 insertions(+), 58 deletions(-) create mode 100644 web/static/background.png diff --git a/web/dgf.py b/web/dgf.py index daa1473..aa9a08b 100755 --- a/web/dgf.py +++ b/web/dgf.py @@ -117,5 +117,4 @@ def collection_delete(schema_id, coll_id): return render_template("collection_delete.html", sid=schema_id, cid=coll_id) if __name__ == "__main__": - app.debug = True app.run() diff --git a/web/static/background.png b/web/static/background.png new file mode 100644 index 0000000000000000000000000000000000000000..9238d80c8eaf360a8ef8163895183603ff1486ee GIT binary patch literal 493 zcmV z#!FJ|8MtPzh{Y%j!*C~pr5Tc6`A^4t3?A=QXfYc4{REbLRspx@#Qj(A{)~Q_Mfo#7 z^}yXY7GP!o+<9c5j{O3-?>r8XpRDZ|Z-R5$d3k*V&V?pGDCjT1c`ueNoB_4KJ+&pr zz1#cJDLM92djNMqW%nhK2LVSy%kHnh^8&|$vp-V(BU;kHBT` zl9vl#yusE|VM?P7gFAG733BZO8D(Zlvo|mU=l781eCERgeNhAaU)=-XaJ1I|XDPto zC1R=~IDdCCIO~i0;H-N9oW=bs;LPCQ@QL;UIDgU^IIOR?!TEokpfo^5e*n%qTLAq* jPFy)MxcWn|Sl9dj8dV9uJ$I&+00000NkvXXu0mjfk#psi literal 0 HcmV?d00001 diff --git a/web/static/style.css b/web/static/style.css index 533f7bc..b25e9d2 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -1,61 +1,9 @@ body { font-family: sans-serif; - background: #eee; -} -a { - color: #377ba8; -} -h1, h2 { - color: #000000; - font-family: 'Georgia', serif; - margin: 0; -} -h1 { - border-bottom: 2px solid #eee; -} -h2 { - font-size: 1.2em; -} - -.page { - margin: 2em auto; - width: 70em; - border: 5px solid #ccc; - padding: 0.8em; - background: white; + background: url('background.png') repeat; } -.entries { - list-style: none; - margin: 0; - padding: 0; -} -.entries li { - margin: 0.8em 1.2em; -} -.entries li h2 { - margin-left: -1em; -} -.add-entry { - font-size: 0.9em; - border-bottom: 1px solid #ccc; -} -.add-entry dl { - font-weight: bold; -} -.metanav { - text-align: right; - font-size: 0.8em; - padding: 0.3em; - margin-bottom: 1em; - background: #fafafa; -} -.flash { - background: #cee5F5; - padding: 0.5em; - border: 1px solid #aacbe2; - } -.error { - background: #f0d6d6; - padding: 0.5em; +#header { + position: center; + background: #666666; } diff --git a/web/templates/layout.html b/web/templates/layout.html index 83a91cf..fec4186 100644 --- a/web/templates/layout.html +++ b/web/templates/layout.html @@ -4,8 +4,10 @@ Data Gristle +
-

Data Gristle

More Info Home> From 766d51c8fb54fe1606b65024469c0576d507f701 Mon Sep 17 00:00:00 2001 From: William Farmer Date: Sat, 31 May 2014 18:56:03 -0600 Subject: [PATCH 3/3] First revision complete. --- web/static/style.css | 65 +++++++++++++++++++++++++++++++++++++-- web/templates/layout.html | 29 ++++++++--------- 2 files changed, 75 insertions(+), 19 deletions(-) diff --git a/web/static/style.css b/web/static/style.css index b25e9d2..d18d7e0 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -3,7 +3,66 @@ body { background: url('background.png') repeat; } -#header { - position: center; - background: #666666; +a { + text-decoration: none; + color: black; +} + +table, th, td { + border: 1px solid black; +} + +.header { + width: 100%; + background-color: #94DBFF; +} + +.header * { + list-style: none; + margin: 0 0; + padding: 0 0; +} + +.header ul { + position: relative; + top: 0; + left: 0; + right: 0; + z-index: 99; + max-width: 100%; + margin: 0 auto; + padding: 0 1em; + display: block; +} + +.header ul:after { + content: ""; + clear: both; + display: block; +} + +.header a { + text-align: center; + font-size: 1em; + padding: 1.63em 2em; + float: left; +} + +.header a:hover { + background-color: #FF8533 +} + +#title { + float: left; + font-size: 1.174em; + padding: 1em; + background-color: #FF8533 +} + +.nav { + padding: 0em 0em; +} + +.page { + background-color: #eeffee; } diff --git a/web/templates/layout.html b/web/templates/layout.html index fec4186..dd2baa5 100644 --- a/web/templates/layout.html +++ b/web/templates/layout.html @@ -4,24 +4,21 @@ Data Gristle -