Merge pull request #266 from jan-stanek/master

změna barvy hlášky o nezapsaných programech
skaut · Apr 3, 2017 · 158c99b · 158c99b
2 parents ede58a2 + 5504840
commit 158c99b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 *~
-composer.lock
-.idea
-composer.phar
-deployment.ini
-deployment.log
-!.gitignore
+/composer.lock
+/.idea
+/composer.phar
+/deployment.ini
+/deployment.log
 /vendor
-!/vendor/.gitignore
+!.gitignore
+
diff --git a/app/WebModule/components/templates/programs_content.latte b/app/WebModule/components/templates/programs_content.latte
@@ -71,7 +71,7 @@
                         </div>
                     </div>
 
-                    <div class="alert alert-danger alert-forever" ng-show="mandatory_nonregistered_programs_count">
+                    <div class="alert alert-warning alert-forever" ng-show="mandatory_nonregistered_programs_count">
                         {_web.programs_content.mandatory_programs_not_registered}
                     </div>
 

diff --git a/vendor/.gitignore b/vendor/.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ @@
                             </div>
                         </div>
-                        <div class="alert alert-danger alert-forever" ng-show="mandatory_nonregistered_programs_count">
+                        <div class="alert alert-warning alert-forever" ng-show="mandatory_nonregistered_programs_count">
                             {_web.programs_content.mandatory_programs_not_registered}
                         </div>
@@ Expand Down @@