Commit graph

97 commits

Author SHA1 Message Date
Diana dfb202ab32 Merge pull request #7549 from Wikia/DAT-2880
DAT-2880 add bottom border
2015-06-19 15:55:00 +02:00
idradm 2b6d2f60e6 fix scss formatting 2015-06-19 15:03:11 +02:00
idradm 3e8a665242 Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
#	extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
2015-06-19 14:43:40 +02:00
Rafal Leszczynski f0082834e9 fix infobox item element border bottom issues 2015-06-19 14:37:45 +02:00
Rafal Leszczynski bd9dc38966 Merge branch 'dev' into DAT-2880 2015-06-19 12:15:28 +02:00
Rafal Leszczynski a29b1fb160 fix comparison and group bottom border issues 2015-06-19 12:13:30 +02:00
Diana bec30303e2 merge with dev 2015-06-18 15:18:35 +00:00
Diana 216dc462f5 take care of lists 2015-06-18 14:47:38 +00:00
Rodrigo Molinero Gomez 9b4d70899e Merge pull request #7545 from Wikia/DAT-2902
DAT-2902 fix label font size in horizontal group
2015-06-18 12:46:29 +02:00
Diana 75fefe3a87 refactor 2015-06-17 18:24:28 +00:00
Diana 89e8474bcc add bottom border 2015-06-17 15:15:18 +00:00
Diana 3dedee922f fix line height 2015-06-17 13:42:04 +00:00
Rafal Leszczynski 404b0c5897 fix label font size in horizontal group 2015-06-17 14:34:20 +02:00
Rafal Leszczynski d0e518beae remove tabular layout inside horizontal group 2015-06-17 13:51:05 +02:00
dianafa d3638ddc9a fix line height 2015-06-17 12:00:10 +02:00
Diana 6e11102386 update bad padding 2015-06-16 15:49:15 +02:00
Rafal Leszczynski f1d77bcf70 reset headers font color to default 2015-06-12 15:36:24 +02:00
Rafal Leszczynski 581f5458be change infobox default color theme calulation 2015-06-12 15:32:25 +02:00
Rafal Leszczynski f569991469 Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
2015-06-12 15:23:44 +02:00
Rafal Leszczynski a3e9b2b92a fix linting issues 2015-06-12 12:56:28 +02:00
Rafal Leszczynski c82a5cd05e Merge branch 'infobox-tabular-layout' of https://github.com/Wikia/app into infobox-tabular-layout 2015-06-12 12:39:32 +02:00
Rafal Leszczynski 24d23698aa fix linting issues 2015-06-12 12:38:17 +02:00
Diana b698b32170 styles 2015-06-11 17:03:57 +00:00
Diana 20289950d1 getXmlAttributeFromSupported 2015-06-11 13:36:57 +00:00
Diana ef4488bd4a add horizontal group styling 2015-06-10 17:13:45 +00:00
Rafal Leszczynski 92578b393f fix linting errors 2015-06-10 17:31:29 +02:00
Rafal Leszczynski 18ca190c0d style infobox markup errors 2015-06-10 17:16:46 +02:00
Diana de8c80334d remove too big padding 2015-06-10 12:49:21 +02:00
Diana c9fb544423 style according to designs 2015-06-09 22:23:51 +02:00
Diana 41f0870480 style according to designs 2015-06-09 22:22:46 +02:00
dianafa f9dd19bbc3 remove unnecesary selector 2015-06-09 11:45:49 +02:00
dianafa acff223c0e refactor tests and css selectors 2015-06-09 11:40:32 +02:00
dianafa abd771d4cc tabular layout only for not nested elements 2015-06-08 21:17:47 +02:00
Diana ec41b3ae6c change selectors 2015-06-08 15:13:25 +00:00
Diana c51ea2888e flex css 2015-06-08 14:32:17 +00:00
Diana 1bfeb9ebb0 clean styling 2015-06-03 17:09:58 +00:00
Diana a38d25d0e3 styling 2015-06-03 15:12:43 +00:00
jacek b386d40858 css 2015-06-02 13:18:41 +02:00
jacek a9c01baed5 hide debug content for articles 2015-06-02 13:09:25 +02:00
jacek 44cbb9cc95 initial commit 2015-05-29 16:37:35 +02:00
Garth Webb fce26a692d SOC-815 First part of merge from dev 2015-05-25 23:46:40 +00:00
Rafal Leszczynski 0ad49267af styling image captions inside infobox 2015-05-25 23:34:49 +00:00
Rafal Leszczynski abb9f4499a prevent image upsampling in infobox 2015-05-21 12:07:40 +02:00
Rafal Leszczynski f6e2f258ec Merge branch 'dev' into portable_infobox_mvp 2015-05-06 14:44:58 +02:00
Rafal Leszczynski 606dc977d6 fix typo in class name 2015-05-04 16:30:17 +02:00
marzjan 4de71fec0f DAT-2757 Based on initial feedback, rename <pair> to <data> 2015-05-04 10:48:57 +00:00
Sebastian Marzjan d8eb7391d3 Portable Infoboxes - initial release behind WF flag 2015-04-28 09:00:26 +02:00