Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup unused styles

Roland Geider1da6ac4c0403
diff --git a/wger/core/static/css/workout-manager-common.css b/wger/core/static/css/workout-manager-common.css
index 0875dd062..e12762ed2 100644
--- a/wger/core/static/css/workout-manager-common.css
+++ b/wger/core/static/css/workout-manager-common.css
@@ -62,23 +62,6 @@
-
-
-/* Use Open Sans for the body text */
-.ui-body-c,
-.ui-body-c input,
-.ui-body-c select,
-.ui-body-c textarea,
-.ui-body-c button {
- font-family: "Open Sans Light", Arial, Helvetica, sans-serif;
- font-weight: 300;
-}
-.ui-body-c .ui-link{
- font-weight: normal;
-}
-
-
-
/**************************************************************
* Styling for the SVG elements on the weight chart
**************************************************************/
@@ -263,7 +246,7 @@ body .boxInner:hover .titleBox, body.touch .boxInner.touchFocus .titleBox {
font-size: 80%;
}
-.titleBox a, .titleBox .ui-link {
+.titleBox a {
color: white;
text-shadow: none;
diff --git a/wger/core/static/css/workout-manager-mobile.css b/wger/core/static/css/workout-manager-mobile.css
index 45c477123..1ffd385bf 100644
--- a/wger/core/static/css/workout-manager-mobile.css
+++ b/wger/core/static/css/workout-manager-mobile.css
@@ -28,105 +28,6 @@ body {
body { padding-top: 50px; }
-/* Use Open Sans for the body text */
-.ui-body-c,
-.ui-body-c input,
-.ui-body-c select,
-.ui-body-c textarea,
-.ui-body-c button,
-.ui-btn-up-b,
-.ui-btn-hover-b,
-.ui-btn-down-b,
-.ui-btn-up-c,
-.ui-btn-hover-c,
-.ui-btn-down-c {
- font-family: "Open Sans Light", Arial, Helvetica, sans-serif;
- font-weight: 300;
-}
-.ui-body-c .ui-link{
- font-weight: normal;
-}
-
-
-
-/*
- * Links in warning boxes get a different style, the default blue doesn't match
- * well with orange
- */
-div.success a.ui-link, div.success a.ui-link:hover, div.success a.ui-link:active,
-div.warning a.ui-link, div.warning a.ui-link:hover, div.warning a.ui-link:active,
-div.info a.ui-link, div.info a.ui-link:hover, div.info a.ui-link:active{
- /*color: black;*/
- text-decoration: underline;
- background-color: transparent;
-}
-
-/*
- * Copied from YAML's typography.css file
- */
-.box {
- border-radius: 0.3em;
- border-width: 1px;
- border-style: solid;
- border-color: #888;
- border-color: rgba(0,0,0,.3);
- -webkit-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.2) inset;
- -moz-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.2) inset;
- box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.2) inset;
- /*color: #444;*/
- color: rgba(0,0,0,.8);
- padding-left:1.4286em;
- padding-right:1.4286em;
- margin: 1.5em 0 0 0;
-}
-
-.dimmed {
- color:#888;
-}
-
-
-table {
- width:100%;
- border-collapse:collapse;
- /*margin: 1.3571em 0 0 0;*/
- color:#333;
- border-top: 1px #ccc solid;
- border-bottom: 1px #ccc solid;
-}
-
-table.bordertable {
- border:1px #ccc solid;
-}
-
-.bordertable thead th {
- background:#e0e0e0;
- border-right:1px #ccc solid;
- border-bottom:1px #ccc solid;
- text-align: left;
-}
-
-.bordertable tbody th[scope="row"] {
- background:#f0f0f0;
-}
-
-tbody th {
- text-align: left;
- border-top:1px solid #ccc;
- text-align:left;
-}
-
-.bordertable tbody th {
- border-right:1px solid #ccc;
-}
-
-tbody td {
- text-align: left;
- border-top:1px solid #ccc;
-}
-
-.bordertable tbody td {
- border-right:1px solid #ccc;
-}
/*
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 5e26e52fc..3b0883086 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -92,7 +92,8 @@ class SetFormMobile(ModelForm):
categories_list = ModelChoiceField(ExerciseCategory.objects,
empty_label=_('All categories'),
label=_('Categories'),
- widget=TranslatedSelect())
+ widget=TranslatedSelect(),
+ required=False)
exercise_list = ModelChoiceField(Exercise.objects)
class Meta:
@@ -164,4 +165,5 @@ class WorkoutSessionHiddenFieldsForm(ModelForm):
model = WorkoutSession
widgets = {'time_start': widgets.HiddenInput(),
'time_end': widgets.HiddenInput(),
- 'user': widgets.HiddenInput()}
+ 'user': widgets.HiddenInput(),
+ 'notes': widgets.Textarea(attrs={'rows': 3})}
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index 93db1be4a..aadff2524 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -132,6 +132,8 @@ function paginate_to(index){
$(document).ready(function() {
+ $('#page-title').remove();
+
$('.timer-step').width(div_width);
$('.timer-step').height(div_height);
@@ -238,7 +240,7 @@ $(document).ready(function() {
// After clicking on the save button once, disable it
function( data ) {
$('#save_button_form').unbind("click");
- $('#save_button_form').addClass('ui-disabled');
+ $('#save_button_form').addClass('disabled');
$('#save_button_form').bind("click", function(e) {
e.preventDefault();
});
@@ -252,7 +254,7 @@ $(document).ready(function() {
{# #}
{# Start page #}
{# #}
-<div id="timer-container" style="position: relative; top:-60px; margin:0px, padding: 0px;">
+<div id="timer-container" style="position: relative; margin:0px, padding: 0px;">
<ul id="workout-timer">
<li class="timer-step" id="div-warmup" data-number="0">
<h2>{% trans "Your workout today" %}</h2>
@@ -399,41 +401,59 @@ $(document).ready(function() {
{{ session_form.time_end }}
{{ session_form.user }}
- <div data-role="popup"
- id="info-{{session_form.notes.auto_id}}"
- data-overlay-theme="a">
- <div data-role="header">
- <h4>{% trans "Info" %}</h4>
- </div>
- <div role="main" class="ui-content">
- {% trans session_form.notes.help_text %}
+
+ <div class="modal fade" id="info-{{session_form.notes.auto_id}}">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title">{% trans "Info" %}</h4>
+ </div>
+ <div class="modal-body">
+ {% trans session_form.notes.help_text %}
+ </div>
+ </div>
</div>
</div>
+
<label for="{{session_form.notes.auto_id}}">
<a href="#info-{{session_form.notes.auto_id}}"
- class="ui-btn ui-btn-inline ui-shadow ui-corner-all ui-icon-info ui-btn-icon-notext"
- data-rel="popup"></a>
+ class="btn btn-default btn-sm"
+ data-toggle="modal">
+ <span class="glyphicon glyphicon-asterisk"></span>
+ </a>
{% trans session_form.notes.label %}
</label>
- {{ session_form.notes }}
-
- <div data-role="popup"
- id="info-{{session_form.impression.auto_id}}"
- data-overlay-theme="a">
- <div data-role="header">
- <h4>{% trans "Info" %}</h4>
- </div>
- <div role="main" class="ui-content">
- {% trans session_form.impression.help_text %}
+ {{ session_form.notes|form_field_add_css:'form-control' }}
+
+ <div class="modal fade" id="info-{{session_form.impression.auto_id}}">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title">{% trans "Info" %}</h4>
+ </div>
+ <div class="modal-body">
+ {% trans session_form.impression.help_text %}
+ </div>
+ </div>
</div>
</div>
<label for="{{session_form.impression.auto_id}}">
<a href="#info-{{session_form.impression.auto_id}}"
- class="ui-btn ui-btn-inline ui-shadow ui-corner-all ui-icon-info ui-btn-icon-notext"
- data-rel="popup"></a>
+ class="btn btn-default btn-sm"
+ data-toggle="modal">
+ <span class="glyphicon glyphicon-asterisk"></span>
+ </a>
{% trans session_form.impression.label %}
</label>
- {{ session_form.impression }}
+ {{ session_form.impression|form_field_add_css:'form-control' }}
+
+ <!--
+ {% render_form_field session_form.notes %}
+ {% render_form_field session_form.impression %}
+ -->
+
</form>
</div>
@@ -441,23 +461,18 @@ $(document).ready(function() {
<h2><strong>{% trans "Time" %}:</strong> <span id="total_time">MM:SS</span></h2>
</div>
- <div class="ui-grid-a bottom_buttons">
- <div class="ui-block-a">
+ <div class="row bottom_buttons">
+ <div class="col-xs-6">
<a href="{% url 'core:dashboard' %}"
- class="wide_link"
- data-role="button"
- data-icon="arrow-r"
- data-ajax="false"
- data-iconpos="right">{% trans "Dashboard" %}</a>
+ class="wide_link btn btn-default">{% trans "Dashboard" %}</a>
</div>
- <div class="ui-block-b">
+ <div class="col-xs-6">
<a href=""
id="save_button_form"
- class="wide_link"
- data-role="button"
- data-icon="check"
- data-ajax="false"
- data-iconpos="right">{% trans "Save" %}</a>
+ class="wide_link btn btn-success">
+ {% trans "Save" %}
+ <span class="glyphicon glyphicon-save"></span>
+ </a>
</div>
</div>
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index f0a684cad..3cb93d9eb 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -69,17 +69,15 @@ $(document).ready(function() {
{% endif %}
<h3>{% trans "Search" %}</h3>
-<div class="ui-widget">
- <form action="{% url 'ingredient-search' %}"
- method="get"
- id="search_form">
- {% csrf_token %}
- <input name="term"
- type="search"
- id="ingredient-search"
- class="ajax-form-element form-control"
- placeholder="{% trans 'ingredient name' %}"
- style="width:100%;">
- </form>
-</div>
+<form action="{% url 'ingredient-search' %}"
+ method="get"
+ id="search_form">
+ {% csrf_token %}
+ <input name="term"
+ type="search"
+ id="ingredient-search"
+ class="ajax-form-element form-control"
+ placeholder="{% trans 'ingredient name' %}"
+ style="width:100%;">
+</form>
{% endblock %}