diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-08-29 04:30:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-29 04:30:52 +0300 |
commit | 0c9c30b731ccbacf47e154b9f7a590af49e3d799 (patch) | |
tree | c5cf2f6437bb2ee7f3675350ee4b0b6acbbae7d3 /plugins/CoreAdminHome/stylesheets | |
parent | bfdf0bed670f247bf9b1d466e3bcf651e98ab634 (diff) |
Better UI for Piwik 3, more responsive, faster, lots of other fixes (#10397)
* improved ui and responsiveness
* improve rss widget
* commit changes for ui again, got lost after the last commit
* fix more tests
* restoring files
* fix fonts
* fix more tests
* more test fixes
* fix some system tests
* fix tests
* fix system and ui tests
* fix updater tests
* make a page as loaded once the callback is called
* enable verbose
* more verbose output
* enable phantomjs debug flag
* debug should be a phantomjs option
* trying to fix installation tests
* fixes #10173 to not compile css files as less
* trying to minimize js/css requests to hopefully prevent random ui test fails
* disable verbose mode
* fix updater and installation
* lots of bugfixes and ui tweaks
* fix reset dashboard
* various bugfixes
* fix integration tests
* fix text color
* hoping to fix installation tests this way
* cache css/js resources for an hour, should speed up tests and prevent some random issues
* we need to avoid installing plugins multiple times at the same time when requesting resources
* finally getting the colors right again
* fix most tests, more tests for theme
* use an h2 element for titles for better accessibility
* fix headline color
* use actual theme text color (piwik-black)
* fix small font size was applied on all p elements
* fix tests
* now improving all the datatables
* trying to ignore images for visitor log
* Revert "trying to ignore images for visitor log"
This reverts commit ad1ff7267aae14ad905bef130e956c8593c4fb22.
* fix tests
* fix we had always ignored a max label width
* trying to fix file permissions
* fix more file permissions
* Improved plugins update API (#10028)
* refs #7983 let plugins add or remove fields to websites and better settings api
* * Hide CorePluginsAdmin API methods
* More documentation
* Added some more tests
* improved updates API for plugins
* better error code as duplicate column cannot really happen when not actually renaming a colum
Conflicts:
core/Updates/3.0.0-b1.php
plugins/CoreUpdater/Commands/Update/CliUpdateObserver.php
* fix DB field piwik_log_visit.location_provider too small (#10003)
* fixes #9564 fix DB field piwik_log_visit.location_provider too small
* use new plugins updater API
* DB field piwik_log_visit.visit_total_actions too small (#10002)
* fixes #9565 DB field piwik_log_visit.visit_total_actions too small
* change type of some db columns that are too small
* fix tests (#10040)
Conflicts:
plugins/CoreAdminHome/Menu.php
plugins/Goals/Menu.php
plugins/MobileMessaging/Menu.php
plugins/SitesManager/Menu.php
plugins/UsersManager/Menu.php
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
* fix more file permissions
* repair more file permissions
* repair more file permissions
* trying to make ui tests work again, the table was missing
* fix some encoding issues
* cross browser fixes and usability improvement
* move back the config icon, need to find a better solution later
* more cross browser fixes
* bugfixes
* fix ui tests
* fix encoding issue
* fix various issues with the ui tests when a test gets aborted
* also skip this visitor log test when aborted
* there were 3 css files that were loaded separately, merge them instead into one css
* forgot to add the actual manifest
* do not add manifest if custom logo is specified
* load font css files first as it was before merging them into big css
* fix link icon was not aligned anymore
* minor fixes
* setting it back to 4px
* in popovers the font variable was always ignored and a different font loaded
* forgot to update screenshots
* fix remaining tests
* this should fix an update error
* added 3 new widgets system check, system summary and plugin updates
* tweak new widgets content
* no page reload when changing date or segment
* in admin home show only enabled widgets
* refs #10295 use getMockBuilder instead of deprecated getMock
* fix some ui tests
* fix various bugs
* fix more tests
* fix ui tests
* add a space between loading image and loading message
* fix docs so they appear on developer.piwik.org
* improved documentation
* introduce new Widget::renderTemplate method for consistency with controllers
* remove no longer needed files
* testing system fonts
* fix strong was not really bold
* more useful system summary
* remove ubuntu font
* fix most tests and removed most em elements
* fix tests
* fix headline was very thin
* update submodule
* update submodules
* update submodule
* fix failing ui tests
* update submodules
Diffstat (limited to 'plugins/CoreAdminHome/stylesheets')
-rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 125 | ||||
-rw-r--r-- | plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css | 36 |
2 files changed, 26 insertions, 135 deletions
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index dde1da48ed..958f51e468 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -14,6 +14,7 @@ #content.admin { font-size: 13px; + margin-top: 0; // Fix the <pre> blocks because of the display: table pre { @@ -26,141 +27,19 @@ margin-right: 8px; } -table.admin { - font-size: 0.9em; - background-color: @theme-color-background-base; - border-collapse: collapse; -} - -table.admin thead th { - border-right: 1px solid @theme-color-background-base; - color: @theme-color-background-base; - text-align: center; - padding: 5px; - text-transform: uppercase; - height: 25px; - background-color: #a3c159; - font-weight: bold; -} - -table.admin tbody tr { - background-color: #fff; - border-bottom: 1px solid #f0f0f0; -} - -table.admin tbody td { - color: #414141; - text-align: left; - vertical-align: top; -} - -table.admin tbody th { - text-align: left; - padding: 2px; -} - -table.admin tbody td, table.admin tbody th { - color: #536C2A; - text-decoration: none; - font-weight: normal; - padding: 10px; -} - -table.admin tbody td:hover, table.admin tbody th:hover { - color: #009193; - text-decoration: none; -} - .access_error { font-size: .7em; padding: 15px; } -.admin p + h2 { - margin-top: 35px; - // .admin p defines a margin-bottom of 10px, we make sure we still have a margin-top of 45px this way -} - -.admin h2 { - border-bottom: 0px; - margin: 45px -15px 11px 0; - padding: 0 0 5px 0; - font-size: 24px; - width: 100%; - - &:first-of-type:not(.secondary) { - margin-top: 7px; - margin-bottom: 16px; - border-bottom: 1px solid @theme-color-background-tinyContrast; - } -} - -.admin h2 + h3 { - margin-top: 0px; -} - -.admin h3 { - margin-top: 30px; -} - .admin p, .admin section { margin-top: 10px; line-height: 140%; padding-bottom: 10px; } -.adminTable { - width: 100%; - clear: both; - margin: 0; -} - -.adminTable a { - text-decoration: none; - color: #2B5C97; -} - -.adminTable abbr { - white-space: nowrap; -} - -.adminTable td { - font-size: 13px; - vertical-align: top; - padding: 7px 15px 9px 10px; - vertical-align: top; -} - -.adminTable td.action-links { - text-align: right; -} - -.adminTable .check-column { - text-align: right; - width: 1.5em; - padding: 0; -} - -.adminTable .num { - text-align: center; -} - -.adminTable .name { - font-weight: bold; -} - -.adminTable .ui-inline-help { - margin-top: 0; - width: 100%; - margin-left: 50px; -} - -.adminTable .columnHelp .ui-inline-help { - margin-left: 0px; -} - /* trusted host styles */ -#trustedHostSettings input { +#trustedHostSettings input:not(.btn) { width: 238px; } diff --git a/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css b/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css index 2686567b3d..0c591087b0 100644 --- a/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css +++ b/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css @@ -1,20 +1,32 @@ -#javascript-output-section textarea, #image-link-output-section textarea { - width: 100%; - display: block; - font-family: "Courier New", Courier, monospace; -} -#javascript-output-section textarea { +#javascript-output-section .codeblock { height: 312px; } -#image-link-output-section textarea { + +#image-link-output-section .codeblock { height: 92px; } -#image-tracking-text { - padding-top: 10px; +.jsTrackingCodeWebsite .input-field, +#image-tracking-code-options .input-field { + margin-top: 0; +} + +#image-tracking-goal-sub .row, +#javascript-tracking-visitor-cv .row, +#js-campaign-query-param-extra .row { + margin-bottom: 0; +} + +#javascript-tracking-visitor-cv > .row { + margin-left: 37px; +} + +#image-tracking-goal-sub > .row, +#js-campaign-query-param-extra > .row { + margin-left: 24px; } -#js-campaign-query-param-extra .form-group { - /* terrible hack for a bug... */ - width: 600px; +#image-tracking-goal-sub .input-field, +#js-campaign-query-param-extra .input-field { + margin-top: 0; } |