diff options
| author | Cesar G <prototech91@gmail.com> | 2014-03-02 14:23:25 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-03-02 14:23:25 -0800 |
| commit | bb09cebb880ace4b6999d84d6db1dfcee435c05f (patch) | |
| tree | 7a7c4b09bef54de417b1d7814b8cbdbdd47c6a67 | |
| parent | 6152d6c41e47a69263d127e2953c0a74cf711171 (diff) | |
| parent | 8db5db64c99eab1378cea0cb2e4ff9a0f6155cc9 (diff) | |
| download | forums-bb09cebb880ace4b6999d84d6db1dfcee435c05f.tar forums-bb09cebb880ace4b6999d84d6db1dfcee435c05f.tar.gz forums-bb09cebb880ace4b6999d84d6db1dfcee435c05f.tar.bz2 forums-bb09cebb880ace4b6999d84d6db1dfcee435c05f.tar.xz forums-bb09cebb880ace4b6999d84d6db1dfcee435c05f.zip | |
Merge remote-tracking branch 'Crizz0/ticket/12126' into develop
* Crizz0/ticket/12126:
[ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alert
[ticket/12126] left:0 and right: 0; admin.css --> width: auto
[ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"
[ticket/12126] Fixed position of alert box in IE
| -rw-r--r-- | phpBB/adm/style/admin.css | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 13 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 3c7e378b2b..7ef74e4db0 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1572,7 +1572,7 @@ input.button1:focus, input.button2:focus, input.button3:focus { top: 150px; left: 0; right: 0; - max-width: 600px; + width: 620px; margin: 0 auto; z-index: 50; padding: 25px; @@ -1642,7 +1642,7 @@ input.button1:focus, input.button2:focus, input.button3:focus { @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { .phpbb_alert { - max-width: none; + width: auto; margin: 0 25px; } } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 84f6859936..d19b967771 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -812,16 +812,15 @@ li.pagination ul { ---------------------------------------- */ .phpbb_alert { border: 1px solid transparent; - position: fixed; display: none; + left: 0; + padding: 0 25px 20px 25px; + position: fixed; + right: 0; top: 150px; - left: 0; - right: 0; - max-width: 640px; - margin: 0 auto; z-index: 50; - padding: 25px; - padding: 0 25px 20px 25px; + width: 620px; + margin: 0 auto; } @media only screen and (max-height: 500px), only screen and (max-device-width: 500px) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index a6bc52db52..7e4caf5301 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -495,8 +495,8 @@ fieldset.display-actions { } .phpbb_alert { - max-width: none; - margin: 0 25px; + width: auto; + margin: 0 5px; } .attach-comment dfn { |