Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199660
Change subject: Make smaller widgets float
......................................................................
Make smaller widgets float
TODO: this is a quick fix for now. When widgets get taller this will
break. A better schema is needed, and smaller widgets need to resize
when the window is smaller. Not mvp.
Change-Id: I214ba0658033bacdc32f30a2f9ce6cc046bee720
---
M src/bower_modules
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/cat-trombone/cat-trombone.html
M src/css/style.css
4 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/60/199660/1
diff --git a/src/bower_modules b/src/bower_modules
index f776d8b..b570271 160000
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit f776d8b7f3152ceccfb02f425985c4612d957643
+Subproject commit b57027165c9375498978d3f65b8324d95621351c
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 80f0fa8..5a5855c 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -13,7 +13,7 @@
</div>
<div class="row widgetDisplayRow" data-bind="foreach:
displayedBoard().widgets">
- <div class="col-md-12" style="padding-left:0">
+ <div class="widgetPlace" style="padding-left:0">
<span class="floatingWidget" data-bind="component: { name:
widgetCode, params: { title: displayName, description: description,
configuration: configuration, widgetInstance: id, widgetCode: widgetCode,
dataLoading: dataLoading, sharedContext: $parent.sharedContext } }"><span
data-bind="text: display_name"></span></span>
</div>
</div>
diff --git a/src/components/widgets/cat-trombone/cat-trombone.html
b/src/components/widgets/cat-trombone/cat-trombone.html
index fffac86..2edef20 100644
--- a/src/components/widgets/cat-trombone/cat-trombone.html
+++ b/src/components/widgets/cat-trombone/cat-trombone.html
@@ -9,7 +9,7 @@
<div class="panel-body">
<div class="row-fluid">
<div class="col-md-12">
- <p class="text-center"><img
src="/images/catmusician.gif"></p>
+ <p class="text-center"><img
src="/images/catmusician.gif" style="height:275px"></p>
</div>
</div>
</div>
diff --git a/src/css/style.css b/src/css/style.css
index 9c9551d..53828aa 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -273,7 +273,7 @@
/* Different widget class sizes */
.widget-6 {
- width: 45%;
+ width: 49%;
display:inline-block;
}
@@ -441,6 +441,12 @@
padding: 1em;
}
+.panel {
+ vertical-align: top;
+ min-height: 355px;
+ margin-right: 10px;
+}
+
.panel-transparent {
border-color: #ccc;
}
@@ -513,6 +519,10 @@
min-width: 875px;
}
+.widgetPlace {
+ display: inline;
+}
+
/* C3 Bar Chart Styles */
.c3-region {
fill: red;
--
To view, visit https://gerrit.wikimedia.org/r/199660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214ba0658033bacdc32f30a2f9ce6cc046bee720
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
