diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /ishtar_common/static | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'ishtar_common/static')
| -rw-r--r-- | ishtar_common/static/media/style.css | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 8916dce0b..7aef23099 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -277,7 +277,8 @@ div#header{ box-sizing: border-box; } -div#logo{ +#logo{ + display: block; width:200px; top:40px; left:10px; @@ -583,6 +584,10 @@ ul.form-flex label { padding-left: 10px; } +ul.form-flex li li label { + width: 300px; +} + #window ul.form-flex label { width: 150px; } @@ -1104,7 +1109,12 @@ a.remove{ } .form p.input input.widget-parcel{ - width:85px; + width:50px; +} + +.form p.input input.widget-oa, +input.widget-oa{ + width:100px; } .small, .small input{ |