Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/default-os-monitor'

Conflicts:
	app/assets/javascripts/site.js
	app/views/shared/_monitor.html.haml
	app/views/site/index.html.haml
  • Loading branch information...
commit ce79f2a4c94dfc5c4fbf2ca47240881cf82922d6 2 parents c2a83ed + 8b0ce0d
@schacon schacon authored
View
20 MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Scott Chacon
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
14 app/assets/javascripts/site.js
@@ -28,23 +28,31 @@ $(document).ready(function() {
var DownloadBox = {
init: function() {
+ $('#gui-os-filter').addClass('visible');
var os = window.session.browser.os; // Mac, Win, Linux
if(os == "Mac") {
- $(".monitor").removeClass("linux");
$(".monitor").addClass("mac");
$("#download-link").text("Download for Mac").attr("href", "/download/mac");
- $("#alt-link").text("Windows Build").attr("href", "/download/win");
+ $("#gui-link").removeClass('mac').addClass('gui');
+ $("#gui-link").text("Mac GUIs").attr("href", "/download/gui/mac");
$("#gui-os-filter").attr('data-os', 'mac');
$("#gui-os-filter").text("Only show GUIs for my OS (Mac)")
} else if (os == "Windows") {
- $(".monitor").removeClass("linux");
$(".monitor").addClass("windows");
$("#download-link").text("Download for Windows").attr("href", "/download/win");
+ $("#gui-link").removeClass('mac').addClass('gui');
+ $("#gui-link").text("Windows GUIs").attr("href", "/download/gui/win");
$("#alt-link").removeClass("windows").addClass("mac");
$("#alt-link").text("Mac Build").attr("href", "/download/mac");
$("#gui-os-filter").attr('data-os', 'windows');
$("#gui-os-filter").text("Only show GUIs for my OS (Windows)")
} else if (os == "Linux") {
+ $(".monitor").addClass("linux");
+ $("#download-link").text("Download for Linux").attr("href", "/download/linux");
+ $("#gui-link").removeClass('mac').addClass('gui');
+ $("#gui-link").text("Linux GUIs").attr("href", "/download/gui/linux");
+ $("#alt-link").removeClass("windows").addClass("mac");
+ $("#alt-link").text("Mac Build").attr("href", "/download/mac");
$("#gui-os-filter").attr('data-os', 'linux');
$("#gui-os-filter").text("Only show GUIs for my OS (Linux)")
} else {
View
15 app/assets/stylesheets/front-page.css.scss
@@ -108,8 +108,11 @@ $monitor-height: 271px;
}
.monitor {
- width: 313px;
- height: 271px;
+ background: transparent url(/images/monitor-default.png) top right no-repeat;
+ padding-top: 45px;
+ padding-left: 40px;
+ height: $monitor-height - 45;
+ width: $monitor-width - 40;
color: #fff;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
h4 {
@@ -160,17 +163,9 @@ $monitor-height: 271px;
}
&.windows {
background: transparent url(/images/monitor-windows.png) top right no-repeat;
- padding-top: 45px;
- padding-left: 40px;
- height: $monitor-height - 45;
- width: $monitor-width - 40;
}
&.linux {
background: transparent url(/images/monitor-linux.png) top right no-repeat;
- padding-top: 45px;
- padding-left: 40px;
- height: $monitor-height - 45;
- width: $monitor-width - 40;
}
}
View
4 app/assets/stylesheets/typography.css.scss
@@ -292,7 +292,11 @@ a.subtle-button {
}
a#gui-os-filter {
+ display: none;
margin-top: 15px;
+ &.visible {
+ @include inline-block;
+ }
}
div.more {
View
4 app/views/shared/_monitor.html.haml
@@ -1,8 +1,8 @@
-%div.monitor.linux
+%div.monitor
%h4 Latest stable release
%span.version= latest_version
=link_to "Release Notes", latest_relnote_url
%span.release-date= latest_release_date
- =link_to "Download for Linux", "/download/linux", {:class => 'button', :id => 'download-link'}
+ =link_to "Download Source Code", "https://github.com/git/git/tags", {:class => 'button', :id => 'download-link'}
View
5 app/views/site/index.html.haml
@@ -42,8 +42,13 @@
%table
%tr
+<<<<<<< HEAD
%td{:nowrap => true}= link_to "Graphical UIs", "/downloads/guis", {:class => 'icon gui', :id => 'gui-link'}
%td{:nowrap => true}= link_to "Tarballs", "https://github.com/git/git/tags", {:class => 'icon older-releases'}
+=======
+ %td{:nowrap => true}= link_to "Mac Build", "/download/mac", {:class => 'icon mac', :id => 'gui-link'}
+ %td{:nowrap => true}= link_to "Older Releases", "https://github.com/git/git/tags", {:class => 'icon older-releases'}
+>>>>>>> origin/default-os-monitor
%tr
%td{:nowrap => true}= link_to "Windows Build", "/download/win", {:class => 'icon windows', :id => 'alt-link'}
%td{:nowrap => true}= link_to "Source Code", "https://github.com/git/git", {:class => 'icon source'}
View
BIN  public/images/monitor-default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.