summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2014-02-06 18:57:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-09 12:23:59 -0700
commita6867343b65e8062b1c987aac9e533a33e581b40 (patch)
tree8a4fb036fb56add47558e853d39b8973405d126a /bitbake/lib/toaster/toastergui
parent438578e2997f718f4ab2f50f309364edb6e3b4f8 (diff)
downloadpoky-a6867343b65e8062b1c987aac9e533a33e581b40.tar.gz
bitbake: toaster: Remove inline styles in h1
The templates bpackage.html, recipes.html and build.html included an inline style declaration in the div containing the h1 tag to add a top margin of 40px. The extra top margin is unnecessary in bpackage.html and recipes.html, but nicely separates the Recent builds and All builds sections in build.html. The changes remove the inline style declaration and create a .top-air class in default.css to include the extra top margin when needed, i.e. in the build.html template. (Bitbake rev: 2841f0740024a8351606452a5f803b9b7f70c783) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/bpackage.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/build.html4
-rwxr-xr-xbitbake/lib/toaster/toastergui/templates/recipes.html2
4 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index f523d415f1..76d6cb9b8b 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -98,6 +98,7 @@ th > a, th > span { font-weight: normal; }
98.dropdown-menu { padding: 10px; } 98.dropdown-menu { padding: 10px; }
99select { width: auto; } 99select { width: auto; }
100.page-header { color: #5A5A5A; } 100.page-header { color: #5A5A5A; }
101.top-air { margin-top: 40px;}
101.progress { margin-bottom: 0px; } 102.progress { margin-bottom: 0px; }
102.lead .badge { font-size: 18px; font-weight: normal; border-radius: 15px; padding: 9px; } 103.lead .badge { font-size: 18px; font-weight: normal; border-radius: 15px; padding: 9px; }
103.well > .lead, .alert .lead { margin-bottom: 0px; } 104.well > .lead, .alert .lead { margin-bottom: 0px; }
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html
index cc8ec90395..1eb1f8e5c3 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html
@@ -8,7 +8,7 @@
8 8
9{% block buildinfomain %} 9{% block buildinfomain %}
10<div class="span10"> 10<div class="span10">
11<div class="page-header" style="margin-top:40px;"> 11<div class="page-header">
12<h1> 12<h1>
13 {% if request.GET.filter or request.GET.search and objects.count > 0 %} 13 {% if request.GET.filter or request.GET.search and objects.count > 0 %}
14 {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found 14 {{objects.paginator.count}} package{{objects.paginator.count|pluralize}} found
diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html
index 5867cbb7da..bdfa5c20e3 100644
--- a/bitbake/lib/toaster/toastergui/templates/build.html
+++ b/bitbake/lib/toaster/toastergui/templates/build.html
@@ -8,7 +8,7 @@
8<div class="row-fluid"> 8<div class="row-fluid">
9 9
10 {%if mru.count > 0%} 10 {%if mru.count > 0%}
11 <div class="page-header" style="margin-top:40px;"> 11 <div class="page-header top-air">
12 <h1> 12 <h1>
13 Recent Builds 13 Recent Builds
14 </h1> 14 </h1>
@@ -53,7 +53,7 @@
53 53
54 {% endfor %}{%endif%} 54 {% endfor %}{%endif%}
55 55
56 <div class="page-header" style="margin-top:40px;"> 56 <div class="page-header top-air">
57 <h1> 57 <h1>
58 {% if request.GET.filter or request.GET.search and objects.count > 0 %} 58 {% if request.GET.filter or request.GET.search and objects.count > 0 %}
59 {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found 59 {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found
diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html
index aa0610434f..37d9dcee0e 100755
--- a/bitbake/lib/toaster/toastergui/templates/recipes.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipes.html
@@ -8,7 +8,7 @@
8 8
9{% block buildinfomain %} 9{% block buildinfomain %}
10<div class="span10"> 10<div class="span10">
11<div class="page-header" style="margin-top:40px;"> 11<div class="page-header">
12<h1> 12<h1>
13 {% if request.GET.filter or request.GET.search and objects.count > 0 %} 13 {% if request.GET.filter or request.GET.search and objects.count > 0 %}
14 {{objects.paginator.count}} recipe{{objects.paginator.count|pluralize}} found 14 {{objects.paginator.count}} recipe{{objects.paginator.count|pluralize}} found