diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:28:02 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:28:02 +0530 |
| commit | 0e0e12963a290b60b2f540fad60d240c515dd679 (patch) | |
| tree | e642d260d52f9e1a4e91ad6ee20b7982e9c56e22 /phpBB/styles/prosilver/theme | |
| parent | efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4 (diff) | |
| parent | 478c3ea3a07437e752331ee74ccb20f52c3ab4c9 (diff) | |
| download | forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.gz forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.bz2 forums-0e0e12963a290b60b2f540fad60d240c515dd679.tar.xz forums-0e0e12963a290b60b2f540fad60d240c515dd679.zip | |
Merge remote-tracking branch 'prototech/ticket/11928' into develop
# By Cesar G
# Via Cesar G
* prototech/ticket/11928:
[ticket/11928] Javascript requires camel case.
[ticket/11928] Rename loadingAlert to loading_indicator.
[ticket/11928] Make sure the indicator is on top of other elements.
[ticket/11928] Replace AJAX loading popup with animation.
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/loading.gif | bin | 0 -> 1320 bytes |
3 files changed, 20 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 960415afbf..d4e63bf3ec 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1104,6 +1104,11 @@ input.disabled { background-color: #000000; } +#loading_indicator { + background-color: #000000; + background-image: url("./images/loading.gif"); +} + #notification_list ul li { border-bottom-color: #B9B9B9; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 84aea8212c..225673a932 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -821,6 +821,21 @@ li.pagination ul { opacity: 0.5; } +#loading_indicator { + background: center center no-repeat; + border-radius: 5px; + display: none; + opacity: 0.8; + margin-top: -50px; + margin-left: -50px; + height: 50px; + width: 50px; + position: fixed; + left: 50%; + top: 50%; + z-index: 51; +} + /* Miscellaneous styles ---------------------------------------- */ #forum-permissions { diff --git a/phpBB/styles/prosilver/theme/images/loading.gif b/phpBB/styles/prosilver/theme/images/loading.gif Binary files differnew file mode 100644 index 0000000000..e1ed0883e0 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/loading.gif |
