Nextcloud bot
7f00de841b
[tx-robot] updated from transifex
2018-03-14 01:11:29 +00:00
Nextcloud bot
3cae276149
[tx-robot] updated from transifex
2018-03-13 01:12:01 +00:00
Nextcloud bot
4e56a02450
[tx-robot] updated from transifex
2018-03-12 01:12:21 +00:00
Morris Jobke
15c099df4d
Merge pull request #8633 from nextcloud/rakekniven-i18n-fix
...
Improved translation strings
2018-03-11 19:33:26 +01:00
Nextcloud bot
2c503ccdee
[tx-robot] updated from transifex
2018-03-11 01:12:13 +00:00
rakekniven
bcdbbb56b0
Update ThemingControllerTest.php
...
Fixed tests for https://github.com/nextcloud/server/pull/8633
2018-03-10 12:57:09 +01:00
rakekniven
4fc4e6dcaa
Update ThemingController.php
...
Improved translation string.
Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491256?issue=yes
2018-03-10 12:57:05 +01:00
Julius Härtl
573b940761
Use cache prefix for theming as well
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Julius Härtl
95366bbd1f
Fix tests to use ICacheFactory
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex
2018-03-06 01:12:16 +00:00
Morris Jobke
3ced2c7ab2
Merge pull request #8601 from nextcloud/theming-fix-background-color
...
Remove too restrict check for background image/color
2018-03-05 11:28:41 +01:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex
2018-03-04 01:12:42 +00:00
Christian Oliff
d838789259
Use correct input type for the url entry
...
Change `type="text"` to `type="url"`
2018-03-02 16:49:56 +09:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex
2018-03-02 01:12:16 +00:00
Julius Härtl
c521791653
Remove to restrict check for background image/color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-01 14:39:31 +01:00
Nextcloud bot
a7fb9ff8da
[tx-robot] updated from transifex
2018-03-01 01:12:11 +00:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex
2018-02-28 01:12:31 +00:00
Sagorika Das
7394e8ae58
Empty name not allowed
...
Do not allow empty name in theming app.
Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
2018-02-27 10:54:21 +01:00
Morris Jobke
4076c09195
Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_root
...
theming: handle not being in the serverroot
2018-02-26 18:27:54 +01:00
Kyle Fazzari
8dcbea124e
Remove null check
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-02-25 07:08:59 -08:00
Kyle Fazzari
25c89a6feb
Add mock to setup
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-02-24 08:16:42 -08:00
Nextcloud bot
68187e6036
[tx-robot] updated from transifex
2018-02-23 01:12:16 +00:00
Kyle Fazzari
a1f1824116
theming: handle not being in the serverroot
...
Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.
Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.
Fix #8462
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-02-20 22:45:10 -08:00
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex
2018-02-19 01:11:54 +00:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex
2018-02-17 01:12:04 +00:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:24:03 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex
2018-02-14 21:37:31 +00:00
Morris Jobke
d3d045dd5c
Remove unused import statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex
2018-02-13 10:48:27 +00:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex
2018-02-08 01:10:28 +00:00
Morris Jobke
0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css
...
Fix styling issues of guest pages
2018-02-05 12:14:09 +01:00
Roeland Jago Douma
0bde91600a
Fix theming test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-02 21:26:33 +01:00
Julius Härtl
1ac352de6c
Add space on guest pages with custom logo
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 14:20:13 +01:00
Julius Härtl
39461a2e09
Make sure theming logo css only applies when a logo is set
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 14:20:12 +01:00
Nextcloud bot
b78da27d0a
[tx-robot] updated from transifex
2018-02-01 18:28:02 +00:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss
...
SCSS hardening
2018-01-29 16:12:10 +01:00
Julius Härtl
5dbf733395
Fix theming tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 20:13:28 +01:00
Julius Härtl
6770213649
Do not rewrite absolute URLs
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:08:45 +01:00
Julius Härtl
60e601f4ab
Only override image styles if the theming values are set
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:05:10 +01:00
Julius Härtl
5e325730d6
Remove theming migration
...
Those images are alredy migrated after the instance has been updated to NC12
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 15:10:22 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-24 18:10:16 +01:00
Julius Härtl
422e20569b
Theming: adjust background image resizing
...
Support high resolution login images by resizing only images that are wider than 4096px
fixes #7459
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-19 13:34:43 +01:00
Nextcloud bot
0f729e2cd3
[tx-robot] updated from transifex
2018-01-15 01:10:43 +00:00
Roeland Jago Douma
db411f8771
Bump apps
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
Julius Härtl
d4e106f2b3
More detailed theming capabilities
...
This will allow clients to easily check if a custom background is used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 13:23:22 +01:00
Julius Härtl
927626cbaa
Fix appmenu svg double invert
...
This fixes a regression caused by 9b668d0
, where the css filters to
preview color inversion of the app menu was applied by default. This
commit makes the css filters sensitive on what the current state of the
app menu is.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 09:11:32 +01:00
Morris Jobke
8257689e35
Merge pull request #7705 from nextcloud/theming-calc-adjust
...
Adjust theming color calculations using sRGB luma
2018-01-09 23:04:30 +01:00
Julius Härtl
3379290a73
Fix SCSS processing when undoing theming values
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-09 14:18:03 +01:00
Julius Härtl
9bb0299c98
Add colors to tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 16:50:03 +01:00
Julius Härtl
9b668d01f5
Fix preview when theming changes invertion of icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:32:25 +01:00
Julius Härtl
e4f9c75a05
Adjust theming color calculations using sRGB luma
...
based on https://robots.thoughtbot.com/closer-look-color-lightness
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:31:34 +01:00
Julius Härtl
24233162a0
Fix faulty path in theming scss generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 09:43:09 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex
2018-01-04 09:48:31 +00:00
Julius Härtl
63b4d7e183
Remove css invert since we are using svg filters for now
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:08 +01:00
Roeland Jago Douma
094d41937a
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:06:52 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
Morris Jobke
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails
...
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Abijeet
81f34e224c
Allows adding of hex color to the theme-color
...
Fixes #7158 . Adds a # on the color if missing.
Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.
Since the input element now allows a hex code, changed values to hexcode.
In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.
Also changed the way we were determining whether the jscolor component had loaded.
Changed the control to use data-jscolor rather than defining opts in the class.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-08 10:42:41 +01:00
Nextcloud bot
7d529c081a
[tx-robot] updated from transifex
2017-12-07 01:10:37 +00:00
Nextcloud bot
567757c793
[tx-robot] updated from transifex
2017-12-04 01:10:30 +00:00
Nextcloud bot
ffc627e18e
[tx-robot] updated from transifex
2017-12-01 01:10:20 +00:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex
2017-11-30 01:13:19 +00:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex
2017-11-20 01:09:40 +00:00
Nextcloud bot
dd5373795f
[tx-robot] updated from transifex
2017-11-19 01:09:52 +00:00
Nextcloud bot
b2e9cb6a00
[tx-robot] updated from transifex
2017-11-16 01:09:50 +00:00
Nextcloud bot
c5afb25714
[tx-robot] updated from transifex
2017-11-15 01:09:47 +00:00
Nextcloud bot
28e8a1c4b0
[tx-robot] updated from transifex
2017-11-14 01:09:46 +00:00
Julius Härtl
7a812aa0e1
Theming: bump version to retrigger icon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl
d70e9059a5
Theming: Fix tests for favicon containing multiple sizes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl
31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser
...
fixes #5193
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-11-13 10:18:47 +01:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex
2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex
2017-11-11 01:10:09 +00:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
Morris Jobke
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint
...
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
Morris Jobke
479966dce8
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
Julius Härtl
b1b8c99193
Theming: add hint about favicon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 23:31:18 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master
...
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
Julius Härtl
00956c00b2
Theming: expose element color though capabilities API
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 12:31:23 +01:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex
2017-11-07 01:08:57 +00:00
Morris Jobke
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex
2017-11-03 01:09:06 +00:00
Nextcloud bot
cc83052ca7
[tx-robot] updated from transifex
2017-11-01 01:08:44 +00:00
Nextcloud bot
299ef9aa78
[tx-robot] updated from transifex
2017-10-31 01:08:31 +00:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex
2017-10-27 00:08:29 +00:00
Nextcloud bot
37bedbc10d
[tx-robot] updated from transifex
2017-10-26 00:08:39 +00:00
Nextcloud bot
c85deacddb
[tx-robot] updated from transifex
2017-10-25 00:08:45 +00:00
Morris Jobke
43e498844e
Use ::class in test mocks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex
2017-10-24 00:08:45 +00:00
Nextcloud bot
3709d3eeae
[tx-robot] updated from transifex
2017-10-21 00:08:26 +00:00
Markus Staab
db34b59238
Prevent XSS in links which open a new browser window
2017-10-19 12:16:04 +02:00
Nextcloud bot
8e884ba52f
[tx-robot] updated from transifex
2017-10-18 00:08:23 +00:00
Nextcloud bot
59c3ea91fd
[tx-robot] updated from transifex
2017-10-17 00:08:23 +00:00
Roeland Jago Douma
1b2568e637
Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling
...
Theming: Handle errors on uploaded files properly
2017-10-15 21:44:48 +02:00
Nextcloud bot
61077df79a
[tx-robot] updated from transifex
2017-10-08 00:08:22 +00:00
Julius Härtl
f15e85c4f5
Theming: Add tests for mimetype and upload error checks
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:34:44 +02:00
Julius Härtl
9651c1abff
Theming: Fix message/loading display on errors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Julius Härtl
c0d104087b
Theming: Check valid image format also for logo
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Julius Härtl
c337c8fa45
Theming: Handle errors on uploaded files properly
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Nextcloud bot
8be053516b
[tx-robot] updated from transifex
2017-09-30 00:08:25 +00:00
Nextcloud bot
95ec247d10
[tx-robot] updated from transifex
2017-09-29 00:08:21 +00:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex
2017-09-27 00:08:23 +00:00
Nextcloud bot
887229b7b8
[tx-robot] updated from transifex
2017-09-22 00:08:22 +00:00
Nextcloud bot
d603d78630
[tx-robot] updated from transifex
2017-09-19 00:08:27 +00:00
Nextcloud bot
60e0de4a36
[tx-robot] updated from transifex
2017-09-18 00:08:32 +00:00
Morris Jobke
d659199ff5
Merge pull request #5398 from nextcloud/theming-page-title
...
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
2017-09-13 13:08:37 +02:00
Joachim Bauch
91598cbfb5
Use theme methods "getTitle" and "getEntity" as fallback if name is not themed.
...
This fixes an issue with custom filesystem themes that can define title, name
and entity differently, but the theming app was only using the name as fallback
(see #5374 ).
Signed-off-by: Joachim Bauch <bauch@struktur.de>
2017-09-13 11:02:45 +02:00
Morris Jobke
241579587a
Merge pull request #6457 from nextcloud/theming-favicon-invert-apps
...
Invert themed favicons on bright colors
2017-09-13 10:48:33 +02:00
Morris Jobke
83508d7be3
Merge pull request #6451 from nextcloud/theming-manifest-json
...
Theming app support for chrome manifest.json file
2017-09-12 15:10:08 +02:00
Julius Härtl
9a47b25f19
Theming: Invert app icon in favicon for bright backgrounds
...
fixes #5650
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 11:37:25 +02:00
Julius Härtl
1f8a3e05c1
Theming: Use png32 for generated icons
...
fixes #4796
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 11:34:21 +02:00
Julius Härtl
81ef116bfb
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:28:22 +02:00
Julius Härtl
770aae42f6
Add themed manifest.json to theming app
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:23:12 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:22:57 +02:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex
2017-09-12 00:08:25 +00:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex
2017-09-10 00:08:23 +00:00
Nextcloud bot
9959560649
[tx-robot] updated from transifex
2017-09-07 00:08:23 +00:00
Morris Jobke
f5aea79bd7
Fix layout of alternative login buttons
...
* fixes #6367
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 10:21:11 +02:00
Julius Härtl
63d1da50b4
Cleanup theming styles to fit the new login page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:31:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:30:46 +02:00
Julius Härtl
da5662c454
Use separate element color in theming
...
This way we can use a grey color when the primary color is to bright
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:30:46 +02:00
Julius Härtl
0a49757535
Change invertion threshold to 55%
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-02 21:48:14 +02:00
Jan-Christoph Borchardt
2e6d1a3453
Set primary action button color to same as theming color
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt
badbab81ea
Update background image to the one used on the website
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:04:11 +02:00
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex
2017-08-19 00:08:26 +00:00
Nextcloud bot
d7406e5159
[tx-robot] updated from transifex
2017-08-16 00:08:33 +00:00
Morris Jobke
8c97218b95
Merge pull request #6128 from nextcloud/primary-font-color-in-capabilities
...
Add the primary font color to the capabilities as well
2017-08-15 21:27:28 +02:00
Joas Schilling
b7b4cfd6a1
Add the primary font color to the capabilities as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-15 13:50:08 +02:00
Morris Jobke
995ddc61d1
Add buttom border for header
...
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 09:40:55 +02:00
Daniel Calviño Sánchez
b16ce1b4ba
Fix preview of theming
...
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.
As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.
Fixes #5975
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:58 +02:00
Daniel Calviño Sánchez
5999b212d1
Refactor reloadStylesheets to receive absolute URLs
...
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
db52e861dd
Provide "server.css" URL in ThemingController response
...
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).
The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
986dffdae4
Split updateStylesheet tests for success and error
...
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
d7e45d45c4
Unify DataResponse format with its uses in the rest of the file
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
Lukas Reschke
9707ef9ba7
Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app
...
Fix loading icon inside upload button in Theming app
2017-08-08 18:41:57 +02:00
Morris Jobke
d7645ee928
Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
...
Replace loading icon GIF with pure CSS in login button
2017-08-08 14:40:35 +02:00
Daniel Calviño Sánchez
2398e845c9
Fix loading icon inside upload button in Theming app
...
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:04:43 +02:00
Morris Jobke
de94eefe97
Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
...
Fix vertical alignment of loading icon and status message in Theming app
2017-08-04 12:08:16 +02:00
Morris Jobke
d63beffe9e
Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon
...
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-04 10:53:21 +02:00
Nextcloud bot
1f8a45bbd7
[tx-robot] updated from transifex
2017-08-04 00:08:18 +00:00
Daniel Calviño Sánchez
b237379fa1
Replace loading icon GIF with pure CSS loading icon
...
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.
This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:43 +02:00
Daniel Calviño Sánchez
09a8c4a5d4
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
c723d093a8
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
4fbcbd3e6d
Align vertically loading icon and status message
...
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
fa7f4e5cae
Do not use the same rules for loading icon than for upload icon
...
The loading icon is used in a totally different way than the upload icon
and thus it should not share its CSS rules.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez
33c4a674a2
Remove ignored rules
...
The removed rules were either always overriden by other rules or never
used due to not matching any element.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Joas Schilling
9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00