From 368e21c085c0ab9e985135d5f67ab84ac86032e0 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 12 May 2014 18:25:23 +0530 Subject: [PATCH 1/9] Remove bootstrap CSS files and use debian package instead - Add depedency on libjs-twitter-bootstrap --- INSTALL | 4 +- LICENSES | 2 - Makefile | 2 +- doc/style.css | 2 +- fabfile.py | 2 +- templates/base.html | 4 +- themes/default/css/bootstrap-responsive.css | 581 --- .../default/css/bootstrap-responsive.min.css | 1 + themes/default/css/bootstrap.css | 3504 ----------------- themes/default/css/bootstrap.min.css | 1 + themes/default/style.css | 1 - 11 files changed, 10 insertions(+), 4094 deletions(-) delete mode 100644 themes/default/css/bootstrap-responsive.css create mode 120000 themes/default/css/bootstrap-responsive.min.css delete mode 100644 themes/default/css/bootstrap.css create mode 120000 themes/default/css/bootstrap.min.css delete mode 120000 themes/default/style.css diff --git a/INSTALL b/INSTALL index d62bc8835..f848445b4 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Install the pandoc, python-augeas, and bjsonrpc: -apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform sudo +apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo Unzip and untar the source into a directory. Change to the directory containing the program. Run: @@ -40,6 +40,8 @@ The documentation has some dependencies too. * *GNU Make* processes /doc/Makefile. +* *libjs-twitter-bootstrap* - A responsive, mobile first front-end framework + * *python-bootstrapform* - Render django forms for Twitter Bootstrap ## Building the Documentation diff --git a/LICENSES b/LICENSES index 1b5b8d8b5..b0b14b0a5 100644 --- a/LICENSES +++ b/LICENSES @@ -85,8 +85,6 @@ specified and linked otherwise. - themes/default/FreedomBox-Logo.7z :: [[http://thread.gmane.org/gmane.linux.debian.freedombox.user/4124/focus=4439][GPL3+/CC-BY-SA]] - themes/default/readme.md :: [[file:themes/default/readme.md::This%20theme%20is%20free%20software%20offered%20to%20you%20under%20the%20terms%20of%20the%20GNU%20Affero%20General%20Public%20License,%20Version%203%20or%20later:][GNU Affero General Public License Version 3]] - themes/default/screenshot.png :: - -- themes/default/css/bootstrap.css :: [[file:themes/default/css/bootstrap.css::*%20Licensed%20under%20the%20Apache%20License%20v2.0][Apache License v2.0]] -- themes/default/css/bootstrap-responsive.css :: [[file:themes/default/css/bootstrap-responsive.css::*%20Licensed%20under%20the%20Apache%20License%20v2.0][Apache License v2.0]] - themes/default/img/apple-touch-icon-114px-precomposed.png :: - - themes/default/img/apple-touch-icon-57px-precomposed.png :: - - themes/default/img/apple-touch-icon-72px-precomposed.png :: - diff --git a/Makefile b/Makefile index a5a050b85..aaf6757f5 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ default: config dirs css docs all: default predepend: - sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform sudo" + sudo sh -c "apt-get install augeas-tools libpython2.7 pandoc psmisc python2.7 python-augeas python-bcrypt python-bjsonrpc python-cherrypy3 python-django python-passlib python-simplejson python-bootstrapform libjs-twitter-bootstrap sudo" git submodule init git submodule update touch predepend diff --git a/doc/style.css b/doc/style.css index 1d1829961..499266614 120000 --- a/doc/style.css +++ b/doc/style.css @@ -1 +1 @@ -../static/theme/style.css \ No newline at end of file +../static/theme/css/bootstrap.min.css \ No newline at end of file diff --git a/fabfile.py b/fabfile.py index 5a4633004..8844179be 100644 --- a/fabfile.py +++ b/fabfile.py @@ -150,7 +150,7 @@ def apache(): @task def deps(): "Basic plinth dependencies" - sudo('apt-get install --no-install-recommends -y python make pandoc python-simplejson python-pyme python-augeas python-bjsonrpc python-django python-bootstrapform') + sudo('apt-get install --no-install-recommends -y python make pandoc python-simplejson python-pyme python-augeas python-bjsonrpc python-django python-bootstrapform libjs-twitter-bootstrap') @task def update(): diff --git a/templates/base.html b/templates/base.html index 6bb30a8df..e6ba3350a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -39,7 +39,7 @@ - + - + - + {{ css|safe }} diff --git a/themes/default/css/plinth.css b/themes/default/css/plinth.css new file mode 100644 index 000000000..ce817d11f --- /dev/null +++ b/themes/default/css/plinth.css @@ -0,0 +1,49 @@ +@media (min-width: 979px) { + body { + padding-top: 60px; + } +} + +body { + padding-bottom: 40px; +} + +.sidebar-nav { + padding: 9px 0; +} + +.super-hero { + margin-top: 25px; +} + +.logo-top { + float: left; + padding-right: 5px; +} + +.brand { + padding-top: 8px; +} + +.white { + color: #fff; +} + +.error-large { + font-size: 1.2em; + padding: 10px; +} + +.main-graphic { + float: right; + padding: 25px; +} + +.nav-icon { + margin-right: 8px; +} + +.sidenav-icon { + margin-right: 8px; + padding-right: 5px; +} From 391d6298c430d91f98d10f037023a79a518b6777 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 12 May 2014 23:28:15 +0530 Subject: [PATCH 5/9] Update firewall page styling --- .../installed/system/templates/firewall.html | 60 +++++++++++-------- themes/default/css/plinth.css | 8 +++ 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/modules/installed/system/templates/firewall.html b/modules/installed/system/templates/firewall.html index 5ef2fa972..19c165a46 100644 --- a/modules/installed/system/templates/firewall.html +++ b/modules/installed/system/templates/firewall.html @@ -43,35 +43,47 @@ firewalld'

{% else %} -