forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
Conflicts: theme/canvas/style/course.css
- Loading branch information
Showing
11 changed files
with
446 additions
and
436 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1,128 @@ | ||
| #page-admin-index #notice { | ||
| text-align: center; | ||
| width: 50%; | ||
| margin: 15px auto; | ||
| padding: 10px 10px; | ||
| text-align: center; | ||
| width: 50%; | ||
| margin: 15px auto; | ||
| padding: 10px 10px; | ||
| } | ||
|
|
||
| #page-admin-index #notice strong { | ||
| background: #ffc; | ||
| background: #ffc; | ||
| } | ||
|
|
||
| #page-admin-index .notifysuccess { | ||
| text-align: center; | ||
| font-weight: bold; | ||
| padding: 10px; | ||
| text-align: center; | ||
| font-weight: bold; | ||
| padding: 10px; | ||
| } | ||
|
|
||
| #page-admin-index h2.main { | ||
| padding: 1em 0; | ||
| padding: 1em 0; | ||
| } | ||
|
|
||
| #page-admin-index .adminwarning { | ||
| border: 1px solid #a35f1d; | ||
| background: #ffeeba; | ||
| padding: 10px; | ||
| margin: 10px auto; | ||
| width: 75%; | ||
| border: 1px solid #a35f1d; | ||
| background: #ffeeba; | ||
| padding: 10px; | ||
| margin: 10px auto; | ||
| width: 75%; | ||
| } | ||
|
|
||
| #page-admin-index .copyright { | ||
| text-align: center; | ||
| margin: 20px auto; | ||
| text-align: center; | ||
| margin: 20px auto; | ||
| } | ||
|
|
||
| #adminsettings .form-buttons { | ||
| width: 100%; | ||
| text-align: center; | ||
| margin: 10px 0; | ||
| width: 100%; | ||
| text-align: center; | ||
| margin: 10px 0; | ||
| } | ||
|
|
||
| #authmenu .generalbox { | ||
| border: none; | ||
| border: none; | ||
| } | ||
|
|
||
| #page-admin-cohort-index .generaltable, | ||
| #page-admin-user .generaltable { | ||
| width: 100%; | ||
| width: 100%; | ||
| } | ||
|
|
||
| #page-admin-roles-manage .generaltable { | ||
| width: 95%; | ||
| margin: 1em auto; | ||
| width: 95%; | ||
| margin: 1em auto; | ||
| } | ||
|
|
||
| #page-admin-roles-allow .generalbox { | ||
| margin: 0 auto 1em; | ||
| width: 65%; | ||
| padding: 10px; | ||
| margin: 0 auto 1em; | ||
| width: 65%; | ||
| padding: 10px; | ||
| } | ||
|
|
||
| .editcourse .singleselect { | ||
| margin: 0; | ||
| margin: 0; | ||
| } | ||
|
|
||
| #page-admin-course-category .generalbox { | ||
| margin-bottom: 0; | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| #userselector_options { | ||
| font-size: 0.75em; | ||
| font-size: 0.75em; | ||
| } | ||
|
|
||
|
|
||
| /* Themes | ||
| ----------------------------*/ | ||
|
|
||
| #page-admin-theme-index .generalbox { | ||
| border: none; | ||
| border: none; | ||
| } | ||
|
|
||
| .theme_screenshot { | ||
| float: left; | ||
| width: 300px; | ||
| float: left; | ||
| width: 300px; | ||
| } | ||
|
|
||
| .theme_screenshot img { | ||
| width: 275px; | ||
| width: 275px; | ||
| } | ||
|
|
||
| .theme_screenshot h2 { | ||
| font-size: 2em; | ||
| font-size: 2em; | ||
| } | ||
|
|
||
| .theme_screenshot h3 { | ||
| font-size: 0.9em; | ||
| margin: 1em 0 0; | ||
| font-size: 0.9em; | ||
| margin: 1em 0 0; | ||
| } | ||
|
|
||
| .theme_screenshot p { | ||
| font-size: 0.9em; | ||
| margin: 0 0 1em; | ||
| font-size: 0.9em; | ||
| margin: 0 0 1em; | ||
| } | ||
|
|
||
| .theme_description { | ||
| margin-left: 300px; | ||
| margin-left: 300px; | ||
| } | ||
|
|
||
| .theme_description h2 { | ||
| padding-top: 0.5em; | ||
| padding-top: 0.5em; | ||
| } | ||
|
|
||
| .plugincheckwrapper {text-align: center;} | ||
|
|
||
| /** | ||
| * Web services | ||
| */ | ||
| #page-admin-webservice-service_users .missingcaps {color: #ff6600;font-size: 90%;} | ||
| #page-admin-setting-webservicetokens .missingcaps {color: #ff6600;font-size: 90%;} | ||
| #page-admin-webservice-service_functions .functiondesc {font-size: 90%;} | ||
|
|
||
| /* Web services | ||
| -------------------------*/ | ||
|
|
||
| #page-admin-webservice-service_users .missingcaps { | ||
| color: #ff6600; | ||
| font-size: 90%; | ||
| } | ||
| #page-admin-setting-webservicetokens .missingcaps { | ||
| color: #ff6600; | ||
| font-size: 90%; | ||
| } | ||
| #page-admin-webservice-service_functions .functiondesc { | ||
| font-size: 90%; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,114 @@ | ||
| .block { | ||
| padding: 0 | ||
| padding: 0 | ||
| } | ||
|
|
||
| .block .footer { | ||
| margin-top: 10px; | ||
| margin-bottom: 0; | ||
| text-align: center; | ||
| margin-top: 10px; | ||
| margin-bottom: 0; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .block_action .reloadnavigation { | ||
| margin-right: 3px; | ||
| margin-right: 3px; | ||
| } | ||
|
|
||
| .block .header .commands .icon { | ||
| padding-left: 2px; | ||
| padding-right: 2px; | ||
| margin-right: 2px; | ||
| padding-left: 2px; | ||
| padding-right: 2px; | ||
| margin-right: 2px; | ||
| } | ||
|
|
||
| .block h3.main { | ||
| padding: 0.5em 0; | ||
| text-align: left; | ||
| font-size: 1.1em; | ||
| padding: 0.5em 0; | ||
| text-align: left; | ||
| font-size: 1.1em; | ||
| } | ||
|
|
||
| /* Login | ||
| ------------------------------*/ | ||
|
|
||
| .block_login .content { | ||
| padding: 5px 10% 5px 0; | ||
| padding: 5px 10% 5px 0; | ||
| } | ||
|
|
||
| .block_login #login_username, | ||
| .block_login #login_password { | ||
| width:90%; | ||
| margin-bottom: 0.5em; | ||
| padding: 2px 5px; | ||
| width:90%; | ||
| margin-bottom: 0.5em; | ||
| padding: 2px 5px; | ||
| } | ||
|
|
||
| .block_login .btn { | ||
| margin-top:1em; | ||
| margin-top:1em; | ||
| } | ||
|
|
||
| .block_login .footer { | ||
| text-align: left; | ||
| text-align: left; | ||
| } | ||
| /* News | ||
| -------------------------------*/ | ||
|
|
||
| .block_news_items .newlink { | ||
| text-align: center; | ||
| margin-bottom: 5px; | ||
| text-align: center; | ||
| margin-bottom: 5px; | ||
| } | ||
|
|
||
| .block_news_items .post .head { | ||
| font-style: italic; | ||
| font-size: 0.9em; | ||
| margin-top: 10px; | ||
| font-style: italic; | ||
| font-size: 0.9em; | ||
| margin-top: 10px; | ||
| } | ||
|
|
||
| .block_news_items .post .date { | ||
| float: right; | ||
| text-align: right; | ||
| float: right; | ||
| text-align: right; | ||
| } | ||
|
|
||
| .block_news_items .post .name { | ||
| float: left; | ||
| color: #555; | ||
| float: left; | ||
| color: #555; | ||
| } | ||
|
|
||
| /* Calendar | ||
| --------------------------------*/ | ||
|
|
||
| .block_calendar_upcoming .event { | ||
| font-weight: bold; | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| .block_calendar_upcoming .date { | ||
| font-weight: normal; | ||
| font-size: 0.85em; | ||
| font-style: italic; | ||
| margin-left: 20px; | ||
| font-weight: normal; | ||
| font-size: 0.85em; | ||
| font-style: italic; | ||
| margin-left: 20px; | ||
| } | ||
|
|
||
| .block_recent_activity .activitydate { | ||
| font-size: 0.9em; | ||
| color: #444; | ||
| margin-bottom: 5px; | ||
| font-size: 0.9em; | ||
| color: #444; | ||
| margin-bottom: 5px; | ||
| } | ||
|
|
||
| .block_recent_activity .activityhead { | ||
| font-size: 0.95em; | ||
| margin: 0.5em 0; | ||
| font-size: 0.95em; | ||
| margin: 0.5em 0; | ||
| } | ||
|
|
||
| /* Messages and Online Users | ||
| -------------------------------*/ | ||
|
|
||
| .block_messages .info, | ||
| .block_online_users .info { | ||
| text-align: center; | ||
| font-size: 0.85em; | ||
| color: #444; | ||
| margin-bottom: 7px; | ||
| text-align: center; | ||
| font-size: 0.85em; | ||
| color: #444; | ||
| margin-bottom: 7px; | ||
| } | ||
|
|
||
| /* Blog Menu | ||
| ------------------------------*/ | ||
|
|
||
| .block_blog_menu .list li { | ||
| font-size: 0.9em; | ||
| margin: 0.25em 0; | ||
| font-size: 0.9em; | ||
| margin: 0.25em 0; | ||
| } |
Oops, something went wrong.