Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into stable
Browse files Browse the repository at this point in the history
In preparation of 2.068.0.
  • Loading branch information
MartinNowak committed Jun 17, 2015
2 parents a01054c + 4264468 commit 307d4c8
Show file tree
Hide file tree
Showing 46 changed files with 9,147 additions and 540 deletions.
7,522 changes: 7,522 additions & 0 deletions .dpl_rewrite_map.txt

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -30,6 +30,7 @@ dlangspec.tex
/web
Makefile
css/cssmenu.css
*.min.*

deleteme.*
docs-prerelease.json
Expand Down
3 changes: 2 additions & 1 deletion arrays.dd
Expand Up @@ -241,7 +241,8 @@ s[1..3] = s[0..2]; // error, overlapping copy
semantics of C.
)

$(P If overlapping is required, use $(FULL_XREF algorithm, copy):
$(P If overlapping is required, use
$(XREF_PACK algorithm,mutation,copy):
)

---------
Expand Down
742 changes: 735 additions & 7 deletions changelog.dd

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cpp_interface.dd
Expand Up @@ -331,8 +331,8 @@ $(H2 Storage Allocation)
result in miserable failure.
)

$(P D can still explicitly allocate memory using std.c.stdlib.malloc()
and std.c.stdlib.free(), these are useful for connecting to C++
$(P D can still explicitly allocate memory using core.stdc.stdlib.malloc()
and core.stdc.stdlib.free(), these are useful for connecting to C++
functions that expect malloc'd buffers, etc.
)

Expand All @@ -344,7 +344,7 @@ $(H2 Storage Allocation)

$(UL

$(LI Making a copy of the data using std.c.stdlib.malloc() and passing
$(LI Making a copy of the data using core.stdc.stdlib.malloc() and passing
the copy instead.)

$(LI Leaving a pointer to it on the stack (as a parameter or
Expand Down
5 changes: 1 addition & 4 deletions css/cssmenu.css.dd
Expand Up @@ -2,9 +2,7 @@ Ddoc

/*Adapted from http://cssmenumaker.com/menu/modern-jquery-accordion-menu
*/
@import url(http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);

@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,600,300);
@charset "UTF-8";
/* Base Styles */
#cssmenu,
Expand All @@ -19,7 +17,6 @@ Ddoc
font-weight: normal;
text-decoration: none;
line-height: 1;
font-family: 'Open Sans', sans-serif;
font-size: 14px;
position: relative;
}
Expand All @@ -34,7 +31,7 @@ Ddoc
}
#cssmenu > ul > li:first-child > a {
border: none;
font-family: 'Ubuntu', sans-serif;
font-family: 'Ubuntu', "Lucida Grande", "Helvetica Neue", Roboto, "Segoe UI", Calibri, Arial, sans-serif;
text-align: center;
font-size: 18px;
font-weight: 300;
Expand Down
74 changes: 68 additions & 6 deletions css/style.css
Expand Up @@ -27,6 +27,23 @@ body::before
height: 1em;
}

/* show signature download on hover */
span.sig_btn
{
display: inline-block;
line-height: 2.4em;
}

span.sig_btn > a:last-child
{
visibility: hidden;
}

span.sig_btn:hover > a:last-child
{
visibility: visible;
}

a.btn
{
color: black !important; /*override a:visited color*/
Expand Down Expand Up @@ -98,7 +115,8 @@ td.param_desc
.download_image
{
display: inline-block;
width: 100px;
width: 100px;
vertical-align: top;
}

h3.download
Expand All @@ -111,6 +129,11 @@ h3.download
display: inline-block;
}

.download_paragraph > h3
{
margin: 0;
}

.footnote
{
font-style: italic;
Expand Down Expand Up @@ -347,6 +370,45 @@ a.anchor:hover:after
font-style: normal; /* ... and should not be italic */
}

/* Avoid inserting the pilcrow in the middle of the line on the compiler pages */

body.dcompiler dt a.anchor:hover:after
{
display: none;
}

body.dcompiler dt a.anchor:hover
{
position: relative;
}

body.dcompiler dt a.anchor:hover:before
{
content: " \00B6";
color: black;
font-style: normal;
position: absolute;
left: -1em;
}

.notice
{
display: block;
padding: 0.5em;
text-align: center;
font-weight: bold;
margin-bottom: 0.5em;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
text-decoration: none;
background-color: white;
border: 1px dotted #633;
}

a.notice:hover
{
background: inherit; /* $(menu_bg_hover) */
}

/* These are different kinds of <pre> sections */
.bnf /* grammar */
{
Expand Down Expand Up @@ -440,8 +502,8 @@ td .d_code2, td .cppcode2, td .cppcode
div#top, div#navigation
{
width: 16em;
background: hsl(0, 0%, 20%); /* #333 */
border: 0.25em none hsl(0, 0%, 10%);
background: #333 /*hsl(0, 0%, 20%)*/;
border: 0.25em none #191919 /*hsl(0, 0%, 10%)*/;
border-right-style: solid;
}
div#top
Expand Down Expand Up @@ -1152,15 +1214,15 @@ div#mobile-top, div#mobile-search, div#mobile-hamburger
}

@media only screen and (max-width: 64em) { /* 1024px for default font-size 16 */

div#news{
display: none;
}

div#content{
margin-right: 1em !important;
}

}

@media only screen and (max-width: 50em) { /* 800px for default font-size 16 */
Expand Down
Binary file added d-keyring.gpg
Binary file not shown.

0 comments on commit 307d4c8

Please sign in to comment.