From ee7fd1c423c1f0ae0240b8ba02ec476704245a0c Mon Sep 17 00:00:00 2001 From: klmp200 Date: Mon, 1 May 2017 15:46:40 +0200 Subject: [PATCH] Rename temporary_design --- core/static/core/style.css | 583 ------------------ .../{temporary_design.scss => style.scss} | 0 core/templates/core/base.jinja | 2 +- 3 files changed, 1 insertion(+), 584 deletions(-) delete mode 100644 core/static/core/style.css rename core/static/core/{temporary_design.scss => style.scss} (100%) diff --git a/core/static/core/style.css b/core/static/core/style.css deleted file mode 100644 index 8d841061..00000000 --- a/core/static/core/style.css +++ /dev/null @@ -1,583 +0,0 @@ -/*--------------------------------GENERAL------------------------------*/ -body{ - background-color:#EEE; - position: relative; - width: 100%; - font-family: sans-serif; -} -a { - text-decoration: none; - color: #265C83; -} -a:hover { color: #7FDBFF; } -a:active { color: #007BE6; } -.ib { - display: inline-block; - padding: 2px; - margin: 2px; -} -.w_big { - width: 75%; -} -.w_medium { - width: 45%; -} -.w_small { - width: 20%; -} -/*--------------------------------HEADER-------------------------------*/ -#logo { - margin-left: 5%; - display: inline-block; -} -header { - display: block; - position: absolute; - top : 0px; - right : 2%; - background-color:#DDD; - margin: 0 10px; - padding: 0 10px; - border-radius: 0 0 10px 10px; -} -header ul { - display: inline-block; - list-style-type: none; - margin: 0px; - padding-right: 3px; - vertical-align: middle; -} -header a { - display: inline-block; - color: inherit; - text-decoration: none; - padding: 1em; -} -header a:hover { - color: #265C83; -} -header form { - display: inline-block; - padding: 1em; - width: 150px; -} -#popupheader { - width: 88%; - margin: 0px auto; - padding: 0.3em 1%; -} -#language_chooser { - position: absolute; - text-align: center; - left: 5px; - top: 5px; -} - -#language_chooser input { - margin: 2px; - width: 3em; - height: 2em; -} -#notif { - display: none; - position: absolute; - background: lightgrey; - text-align: center; - overflow: scroll; - max-height: 400px; -} -#notif li:hover { - background: #bcc; -} - -#alert_box p, #info_box p { - margin: 0px; - padding: 0px; -} -#alert_box, #info_box { - font-size: smaller; - display: inline-block; - border: solid 1px grey; - vertical-align: top; - padding: 2px; - margin: 4px; - margin-top: 60px; - min-width: 10%; - max-width: 30%; - min-height: 20px; -} -#info_box { - background: cornsilk -} -#alert_box { - background: gold; -} - -/*---------------------------------NAV---------------------------------*/ -nav { - display: block; - width: 90%; - margin: 0px auto; - background: grey; - color: white; -} - -nav a { - color: white; - font-style: normal; - font-weight: bolder; - text-decoration: none; - display: inline-block; - padding: 20px; -} -nav a:hover { - background: #535353; - color: white; -} - -/*--------------------------------CONTENT------------------------------*/ -#quick_notif { - width: 90%; - margin: 0px auto; - list-style-type: none; - background: lightblue; -} -#quick_notif li { - padding: 10px; -} -#content { - width: 88%; - margin: 0px auto; - padding: 1em 1%; - background: white; - overflow: auto; -} - -h1, h2, h3, h4, h5, h6 { - font-weight: bold; - margin-top: 0.5em; -} - -h1 { - font-size: 160%; - margin-left: 50px; -} - -h2 { - font-size: 150%; - margin-left: 40px; -} - -h3 { - font-size: 140%; - margin-left: 30px; -} - -h4 { - font-size: 130%; - margin-left: 20px; -} - -h5 { - font-size: 120%; - margin-left: 10px; -} - -h6 { - font-size: 110%; - margin-left: 0px; -} - -p, pre { - margin-top: 1em; - margin-left: 0px; -} - -ul, ol { - margin-top: 1em; - margin-bottom: 1em; - list-style-type: disc; - margin-left: 25px; -} - -code { - font-family: monospace; -} -blockquote { - margin: 10px; - padding: 5px; - border: solid 1px black; -} -.edit-bar { - display: block; - margin: 4px; -} -.edit-bar a { - display: inline-block; - margin: 4px; -} -.important { - font-size: 1.2em; - font-weight: bold; - color: red; -} -table { - width: 100%; - font-size: 0.90em; -} -td { - padding: 4px; - margin: 5px; - border: solid 1px darkgrey; - border-collapse: collapse; - vertical-align: top; - overflow: hidden; - text-overflow: ellipsis; -} -td>ul { - margin-top: 0px; -} -thead { - font-weight: bold; -} -tbody>tr:nth-child(even) { - background: lightgrey; -} -tbody>tr:hover { - background: darkgrey; - width: 100%; -} -em { - font-style: italic; -} -.highlight { - background: orange; - font-weight: bold; -} -.underline { - text-decoration: underline; -} -.tool-bar { - overflow: auto; - padding: 4px; -} -.tools { - float: right; - border: 1px solid grey; -} -.tools a { - padding: 10px; - display: inline-block; -} -.selected_tab { - background: lightgrey; -} -#basket { - width: 40%; - background: lightgrey; - float: right; - padding: 10px; -} -#products { - width: 90%; - margin: 0px auto; - overflow: auto; -} -#bar_ui { - float: left; - min-width: 57%; -} -#user_info_container { -} -#user_info { - float: right; - padding: 5px; - width: 40%; - margin: 0px auto; - background: lightgrey; -} - -/*-----------------------------USER PROFILE----------------------------*/ -#user_profile_container { - width: 80%; - margin: 0px auto; -} -#user_profile { - width: 100%; - margin: 0px auto; - padding: 10px; - overflow: auto; -} -#user_profile h4 { border-bottom: 1px solid grey; max-width: 60%; } -#user_profile #left_column { - width: 59%; -} -#user_profile #right_column { - width: 40%; - float: right; - font-style: italic; -} -#user_profile #pictures { - max-width: 250px; - max-height: 300px; - margin: 0px auto; -} -#user_profile #nickname { - font-style: italic; -} -#user_profile #pictures img { - max-width: 96%; - max-height: 96%; -} -#user_profile .promo_pict { - height: 45px; -} -.mini_profile_link { - display: block; - text-decoration: none; -} -.mini_profile_link span { - display: inline-block; - width: 50px; - vertical-align: middle; -} -.mini_profile_link em { - vertical-align: middle; -} -.mini_profile_link img { - max-width: 40px; - max-height: 60px; - margin: 2px auto; - display: block; -} -#notifications li { - padding: 5px; - margin: 2px; - list-style: none; -} -#moderation div { - margin: 2px; - padding: 2px; - border: solid 1px red; - text-align: center -} -#moderation img { - width: 500px; -} -#pict { - display: inline-block; - width: 80%; - background: #333; - border: solid #333 2px; -} -/*---------------------------------PAGE--------------------------------*/ -.page_content { - display: block; - margin: 10px; - padding: 10px; - background: white; -} - -.page_content code { - font-family: monospace; - color: white; - background: black; - display: inline-block; - padding: 4px; - line-height: 120%; -} -textarea { - white-space: pre; - width: 98%; - margin-top: 10px; -} -/*---------------------------LAUNDERETTE-------------------------------*/ -#token_form label { - display: inline; -} - -/*------------------------------FORUM----------------------------------*/ -.topic a, .forum a, .category a { - color: black; -} -.topic a:hover, .forum a:hover, .category a:hover { - color: #424242; - text-decoration: underline; -} -.topic { - border: solid skyblue 1px; - padding: 2px; - margin: 2px; -} -.forum { - background: lightblue; - padding: 2px; - margin: 2px; -} -.category { - background: skyblue; -} -.message { - padding: 2px; - margin: 2px; - background: #eff7ff; -} -.message:nth-child(odd) { - background: #fff; -} -.message h5 { - font-size: 100%; -} -.message.unread { - background: #d8e7f3; -} -.msg_author.deleted { - background: #ffcfcf; -} -.msg_content.deleted { - background: #ffefef; -} -.msg_content { - display: inline-block; - width: 80%; - vertical-align: top; -} -.msg_author { - display: inline-block; - width: 19%; - text-align: center; - background: #d8e7f3; -} -.msg_author img { - max-width: 70%; - margin: 0px auto; -} -.msg_meta { - font-size: small; - list-style-type: none; -} -.msg_meta li { - padding: 2px; - margin: 2px; -} -.forum_signature { - color: #C0C0C0; - border-top: 1px solid #C0C0C0; -} -.forum_signature a { - color: #C0C0C0; -} -.forum_signature a:hover { - text-decoration: underline; -} -/*------------------------------SAS------------------------------------*/ -.album { - display: inline-block; - border: solid 1px black; - text-align: center; - padding: 5px; - width: 200px; - height: 140px; - background: #eee; - box-shadow: black 2px 2px 10px; - margin: 10px; - vertical-align: top; -} - -.album img { - max-height: 100px; -} - -.picture { - display: inline-block; - border: solid 1px black; - width: 150px; - height: 100px; - margin: 5px; - background: #eee; - box-shadow: grey 2px 2px 5px; - padding: 2px; - vertical-align: middle; -} - -.picture img { - max-width: 100%; - max-height: 100px; - display: block; - margin: auto; -} -.not_moderated { - border: solid 1px red; - box-shadow: red 2px 2px 10px; -} - -/*--------------------------------FOOTER-------------------------------*/ -footer{ - text-align: center; -} - -footer div{ - margin-top: 25px; - margin-bottom: 15px; -} - -footer a{ - margin: 1px 20px; -} - -/*---------------------------------FORMS-------------------------------*/ -form { - margin: 0px auto; - width: 60%; -} -label { - display: block; -} -.choose_file_widget { - display: none; -} -.ui-dialog .ui-dialog-buttonpane { - bottom: 0px; - position: absolute; - width: 97%; -} -#user_edit * { - text-align: center; - -} -#user_edit img { - width: 100px; -} -#cash_summary_form label { - display: inline; -} -.inline { - display: inline; -} -.form_button { - width: 150px; - height: 120px; - padding: 2px; - display: inline-block; - font-size: 0.8em; -} -.form_button span { - width: 70px; - float: right; -} -.form_button img { - max-width: 50px; - max-height: 50px; - float: left; -} -.form_button strong { - font-weight: bold; - font-size: 1.2em; -} -.form_button button { - width: 100%; - height: 100%; - vertical-align: middle; -} - - diff --git a/core/static/core/temporary_design.scss b/core/static/core/style.scss similarity index 100% rename from core/static/core/temporary_design.scss rename to core/static/core/style.scss diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index 1144b7cd..33842017 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -8,7 +8,7 @@ - + {% endblock %}